X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=70cf139d6770ae92924376b201d9cb8efeb4050c;hb=c1ff82962b1b61370b476909bbeb0c9140123ce7;hp=df2cce42dd1d2361c9a04e7660e40b18a919b4de;hpb=9e9937aade05f2ada92b0b9f0b6d844f8e4860f8;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index df2cce42..70cf139d 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -95,13 +95,11 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ { // detect if the producer has finished playing. Is there a better way to do it? Mlt::Frame frame(frame_ptr); - self->showFrame(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) { - self->pause(); - self->emitConsumerStopped(); + if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + self->pause(); + self->emitConsumerStopped(); } + self->showFrame(frame); } Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) : @@ -118,7 +116,8 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi m_isLoopMode(false), m_isSplitView(false), m_blackClip(NULL), - m_winid(winid) + m_winid(winid), + m_paused(true) { qRegisterMetaType ("stringMap"); analyseAudio = KdenliveSettings::monitor_audio(); @@ -128,9 +127,10 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); m_refreshTimer.setSingleShot(true); - m_refreshTimer.setInterval(70); + m_refreshTimer.setInterval(100); connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); connect(this, SIGNAL(multiStreamFound(const QString &,QList,QList,stringMap)), this, SLOT(slotMultiStreamProducerFound(const QString &,QList,QList,stringMap))); + connect(this, SIGNAL(checkSeeking()), this, SLOT(slotCheckSeeking())); } Render::~Render() @@ -386,19 +386,20 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) void Render::seek(GenTime time) { + if (!m_mltProducer) + return; int pos = time.frames(m_fps); seek(pos); } void Render::seek(int time) { - if (!m_mltProducer) - return; + resetZoneMode(); if (requestedSeekPosition == SEEK_INACTIVE) { requestedSeekPosition = time; m_mltProducer->seek(time); - m_mltConsumer->purge(); - if (m_mltProducer->get_speed() == 0) { + //m_mltConsumer->purge(); + if (m_paused) { refresh(); } } @@ -538,7 +539,8 @@ void Render::slotSplitView(bool doit) transition->set("mlt_service", "composite"); transition->set("a_track", 0); transition->set("b_track", i); - transition->set("distort", 1); + transition->set("distort", 0); + transition->set("aligned", 0); transition->set("internal_added", "200"); QString geometry; switch (screen) { @@ -676,7 +678,6 @@ void Render::processFileProperties() KUrl url(path); Mlt::Producer *producer = NULL; CLIPTYPE type = (CLIPTYPE)info.xml.attribute("type").toInt(); - if (type == COLOR) { producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + info.xml.attribute("colour")).toUtf8().constData()); } else if (type == TEXT) { @@ -700,7 +701,7 @@ void Render::processFileProperties() mlt.appendChild(tractor); producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData()); } else { - producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); + producer = new Mlt::Producer(*m_mltProfile, path.toUtf8().constData()); } if (producer == NULL || producer->is_blank() || !producer->is_valid()) { @@ -878,13 +879,17 @@ void Render::processFileProperties() int vindex = -1; const QString mltService = producer->get("mlt_service"); - if (mltService == "xml" || mltService == "consumer") { - // MLT playlist - mlt_profile prof = producer->get_profile(); - filePropertyMap["progressive"] = QString::number(prof->progressive); - filePropertyMap["colorspace"] = QString::number(prof->colorspace); - filePropertyMap["fps"] = QString::number(mlt_profile_fps(prof)); + // MLT playlist, create producer with blank profile to get real profile info + // TODO: is there an easier way to get this info (original source clip profile) from MLT? + Mlt::Profile *original_profile = new Mlt::Profile(); + Mlt::Producer *tmpProd = new Mlt::Producer(*original_profile, path.toUtf8().constData()); + filePropertyMap["progressive"] = QString::number(original_profile->progressive()); + filePropertyMap["colorspace"] = QString::number(original_profile->colorspace()); + filePropertyMap["fps"] = QString::number(original_profile->fps()); + filePropertyMap["aspect_ratio"] = QString::number(original_profile->sar()); + delete tmpProd; + delete original_profile; } else if (mltService == "avformat") { // Get frame rate @@ -929,10 +934,10 @@ void Render::processFileProperties() 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")); - filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio"); + if (!filePropertyMap.contains("aspect_ratio")) filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio"); if (frame->get_int("test_image") == 0) { - if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) { + if (mltService == "xml" || mltService == "consumer") { filePropertyMap["type"] = "playlist"; metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title")); } else if (frame->get_int("test_audio") == 0) @@ -1092,8 +1097,10 @@ int Render::setProducer(Mlt::Producer *producer, int position) if (producer) delete producer; return -1; } + bool monitorIsActive = false; m_mltConsumer->set("refresh", 0); if (!m_mltConsumer->is_stopped()) { + monitorIsActive = true; m_mltConsumer->stop(); } m_mltConsumer->purge(); @@ -1104,6 +1111,7 @@ int Render::setProducer(Mlt::Producer *producer, int position) if (!producer || !producer->is_valid()) { if (producer) delete producer; producer = m_blackClip->cut(0, 1); + producer->set("id", "black"); } if (!producer || !producer->is_valid()) { @@ -1114,9 +1122,38 @@ int Render::setProducer(Mlt::Producer *producer, int position) emit stopped(); if (position == -1 && producer->get("id") == currentId) position = consumerPosition; if (position != -1) producer->seek(position); + m_fps = producer->get_fps(); int volume = KdenliveSettings::volume(); + if (producer->get_int("_audioclip") == 1) { + // This is an audio only clip, create fake multitrack to apply audiowave filter + Mlt::Tractor *tractor = new Mlt::Tractor(); + Mlt::Producer *color= new Mlt::Producer(*m_mltProfile, "color:red"); + color->set_in_and_out(0, producer->get_out()); + tractor->set_track(*producer, 0); + tractor->set_track(*color, 1); + + Mlt::Consumer xmlConsumer(*m_mltProfile, "xml:audio_hack"); + if (!xmlConsumer.is_valid()) return -1; + xmlConsumer.set("terminate_on_pause", 1); + xmlConsumer.connect(tractor->parent()); + xmlConsumer.run(); + delete tractor; + delete color; + delete producer; + QString playlist = QString::fromUtf8(xmlConsumer.get("audio_hack")); + + Mlt::Producer *result = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData()); + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "audiowave"); + result->attach(*filter); + tractor = new Mlt::Tractor(); + tractor->set_track(*result, 0); + delete result; + delete filter; + producer = &(tractor->parent()); + m_mltConsumer->connect(*producer); + } + producer->set("meta.volume", (double)volume / 100); - m_fps = producer->get_fps(); blockSignals(false); m_mltConsumer->connect(*producer); @@ -1127,8 +1164,17 @@ int Render::setProducer(Mlt::Producer *producer, int position) } m_mltProducer = producer; m_mltProducer->set_speed(0); + if (monitorIsActive) { + startConsumer(); + } emit durationChanged(m_mltProducer->get_playtime()); - if (m_mltConsumer->start() == -1) { + position = m_mltProducer->position(); + emit rendererPosition(position); + return 0; +} + +void Render::startConsumer() { + if (m_mltConsumer->is_stopped() && m_mltConsumer->start() == -1) { // ARGH CONSUMER BROKEN!!!! 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.")); if (m_showFrameEvent) delete m_showFrameEvent; @@ -1137,18 +1183,14 @@ int Render::setProducer(Mlt::Producer *producer, int position) m_pauseEvent = NULL; delete m_mltConsumer; m_mltConsumer = NULL; - return -1; + return; } - - position = m_mltProducer->position(); 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; - emit rendererPosition(position); - return 0; } int Render::setSceneList(QDomDocument list, int position) @@ -1497,11 +1539,11 @@ void Render::pause() requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) return; - if (m_mltProducer->get_speed() == 0.0) return; - if (m_isZoneMode) resetZoneMode(); - m_mltConsumer->set("refresh", 0); + m_paused = true; m_mltProducer->set_speed(0.0); - m_mltConsumer->purge(); + m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); + m_mltProducer->seek(m_mltConsumer->position()); } void Render::switchPlay(bool play) @@ -1511,43 +1553,37 @@ void Render::switchPlay(bool play) if (!m_mltProducer || !m_mltConsumer) return; if (m_isZoneMode) resetZoneMode(); - if (play && m_mltProducer->get_speed() == 0.0) { + if (play && m_paused) { if (m_name == Kdenlive::clipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); + m_paused = false; if (m_mltConsumer->is_stopped()) { m_mltConsumer->start(); } m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); } else if (!play) { + m_paused = true; m_mltProducer->set_speed(0.0); m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltProducer->seek(m_mltConsumer->position()); - if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); - if (m_isZoneMode) resetZoneMode(); - - //emitConsumerStopped(); - /*m_mltConsumer->set("refresh", 0); - m_mltConsumer->stop(); - m_mltConsumer->purge(); - m_mltProducer->set_speed(0.0); - //m_framePosition = m_mltProducer->position(); - m_mltProducer->seek(m_framePosition); - emit rendererPosition(m_framePosition);*/ } } void Render::play(double speed) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer) - return; + if (!m_mltProducer) return; + double current_speed = m_mltProducer->get_speed(); + if (current_speed == speed) return; + if (m_isZoneMode) resetZoneMode(); // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1); m_mltProducer->set_speed(speed); - /*if (speed == 0.0) { - m_mltProducer->seek((int) m_framePosition + 1); - m_mltConsumer->purge(); - }*/ - refresh(); + if (m_mltConsumer->is_stopped() && speed != 0) { + m_mltConsumer->start(); + } + m_paused = speed == 0; + if (current_speed == 0 && speed != 0) m_mltConsumer->set("refresh", 1); } void Render::play(const GenTime & startTime) @@ -1555,6 +1591,7 @@ void Render::play(const GenTime & startTime) requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) return; + m_paused = false; m_mltProducer->seek((int)(startTime.frames(m_fps))); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); @@ -1579,6 +1616,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; m_mltProducer->set("out", (int)(stopTime.frames(m_fps))); 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(); @@ -1587,7 +1625,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) void Render::resetZoneMode() { - if (!m_mltProducer || (!m_isZoneMode && !m_isLoopMode)) return; + if (!m_isZoneMode && !m_isLoopMode) return; m_mltProducer->set("out", m_originalOut); //m_mltProducer->set("eof", "pause"); m_isZoneMode = false; @@ -1596,21 +1634,30 @@ void Render::resetZoneMode() void Render::seekToFrame(int pos) { + if (!m_mltProducer) + return; resetZoneMode(); seek(pos); } void Render::seekToFrameDiff(int diff) { + if (!m_mltProducer) + return; resetZoneMode(); if (requestedSeekPosition == SEEK_INACTIVE) seek(m_mltProducer->position() + diff); else seek(requestedSeekPosition + diff); } +void Render::refreshIfActive() +{ + if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused) m_refreshTimer.start(); +} + void Render::doRefresh() { - if (m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start(); + if (m_mltProducer && m_paused) m_refreshTimer.start(); } void Render::refresh() @@ -1620,7 +1667,8 @@ void Render::refresh() return; if (m_mltConsumer) { if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); - m_mltConsumer->purge(); + m_paused = false; + //m_mltConsumer->purge(); m_mltConsumer->set("refresh", 1); } } @@ -1644,6 +1692,12 @@ void Render::setDropFrames(bool show) } } +bool Render::isPlaying() const +{ + if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false; + return !m_paused; +} + double Render::playSpeed() const { if (m_mltProducer) return m_mltProducer->get_speed(); @@ -1672,13 +1726,6 @@ void Render::emitFrameUpdated(Mlt::Frame& frame) 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); - - /*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_RGB888); - memcpy(qimage.bits(), image, width * height * 3);*/ emit frameUpdated(qimage.rgbSwapped()); } @@ -1689,10 +1736,10 @@ void Render::emitFrameNumber() emit rendererPosition(currentPos); if (requestedSeekPosition != SEEK_INACTIVE) { m_mltProducer->seek(requestedSeekPosition); - requestedSeekPosition = SEEK_INACTIVE; - if (m_mltProducer->get_speed() == 0) { + if (m_paused) { refresh(); } + requestedSeekPosition = SEEK_INACTIVE; } } @@ -1701,6 +1748,7 @@ void Render::emitConsumerStopped() // This is used to know when the playing stopped if (m_mltProducer) { double pos = m_mltProducer->position(); + m_paused = true; if (m_isLoopMode) play(m_loopStart); //else if (m_isZoneMode) resetZoneMode(); emit rendererStopped((int) pos); @@ -1741,17 +1789,32 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) void Render::showFrame(Mlt::Frame& frame) { - emit rendererPosition((int) m_mltConsumer->position()); - mlt_image_format format = mlt_image_rgb24a; - 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 showImageSignal(qimage); - if (analyseAudio) showAudio(frame); - if (sendFrameForAnalysis && frame.get_frame()->convert_image) { - emit frameUpdated(qimage.rgbSwapped()); + int currentPos = m_mltConsumer->position(); + if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; + emit rendererPosition(currentPos); + if (frame.is_valid()) { + mlt_image_format format = mlt_image_rgb24a; + 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 showImageSignal(qimage); + if (analyseAudio) showAudio(frame); + if (sendFrameForAnalysis && frame.get_frame()->convert_image) { + emit frameUpdated(qimage.rgbSwapped()); + } + } + emit checkSeeking(); +} + +void Render::slotCheckSeeking() +{ + if (requestedSeekPosition != SEEK_INACTIVE) { + m_mltProducer->seek(requestedSeekPosition); + if (m_paused) { + refresh(); + } } } @@ -1875,6 +1938,7 @@ Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push) { + m_refreshTimer.stop(); if (m_mltProducer == NULL) { kDebug() << "PLAYLIST NOT INITIALISED //////"; return -1; @@ -2024,15 +2088,13 @@ bool Render::mltCutClip(int track, GenTime position) Mlt::Tractor *Render::lockService() { // we are going to replace some clips, purge consumer - QMutexLocker locker(&m_mutex); if (!m_mltProducer) return NULL; + QMutexLocker locker(&m_mutex); if (m_mltConsumer) { - if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); } Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { - kWarning() << "// TRACTOR PROBLEM"; return NULL; } service.lock(); @@ -2106,6 +2168,7 @@ 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";