X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=a821dbbfc5505d1952f45333a13bd95a11c6381b;hb=662a80165046655e809262812fab4ae30dc536e3;hp=bba0bced4f842d29a5c9b53e20289f6a65bc2192;hpb=34c086bb4b4f6c64c0f3265353de53c4eb31262c;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index bba0bced..a821dbbf 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -53,15 +53,16 @@ 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); } -static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) +//static +void Render::consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) { // detect if the producer has finished playing. Is there a better way to do it? self->emitFrameNumber(); @@ -93,29 +94,34 @@ static void consumer_paused(mlt_consumer, Render * self, mlt_frame frame_ptr) else self->emitConsumerStopped(); }*/ - -static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) +// static +void Render::consumer_gl_frame_show(mlt_consumer consumer, Render * self, mlt_frame frame_ptr) { // detect if the producer has finished playing. Is there a better way to do it? + if (self->externalConsumer && !self->analyseAudio && !self->sendFrameForAnalysis) { + emit self->rendererPosition((int) mlt_consumer_position(consumer)); + return; + } Mlt::Frame frame(frame_ptr); if (frame.get_double("_speed") == 0) self->emitConsumerStopped(); else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { self->pause(); self->emitConsumerStopped(true); } - self->showFrame(frame); + emit self->mltFrameReceived(new Mlt::Frame(frame_ptr)); } Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) : AbstractRender(rendererName, parent), requestedSeekPosition(SEEK_INACTIVE), + showFrameSemaphore(1), + externalConsumer(false), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltProfile(NULL), m_showFrameEvent(NULL), m_pauseEvent(NULL), - m_externalConsumer(false), m_isZoneMode(false), m_isLoopMode(false), m_isSplitView(false), @@ -135,6 +141,7 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi 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())); + connect(this, SIGNAL(mltFrameReceived(Mlt::Frame *)), this, SLOT(showFrame(Mlt::Frame *)), Qt::UniqueConnection); } Render::~Render() @@ -229,18 +236,20 @@ void Render::buildConsumer(const QString &profileName) mlt_log_set_callback(kdenlive_callback); } if (m_mltConsumer->is_valid()) { - m_externalConsumer = true; + externalConsumer = true; m_mltConsumer->set("terminate_on_pause", 0); m_mltConsumer->set("deinterlace_method", "onefield"); m_mltConsumer->set("rescale", "nearest"); m_mltConsumer->set("buffer", "1"); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); } - if (m_mltConsumer && m_mltConsumer->is_valid()) return; + if (m_mltConsumer && m_mltConsumer->is_valid()) { + return; + } KMessageBox::information(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())); } } - m_externalConsumer = false; + externalConsumer = false; QString videoDriver = KdenliveSettings::videodrivername(); if (!videoDriver.isEmpty()) { if (videoDriver == "x11_noaccel") { @@ -265,8 +274,7 @@ void Render::buildConsumer(const QString &profileName) if (m_mltConsumer) { m_mltConsumer->set("terminate_on_pause", 0); m_mltConsumer->set("deinterlace_method", "onefield"); - m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); - m_externalConsumer = true; + externalConsumer = true; } } } @@ -274,6 +282,7 @@ void Render::buildConsumer(const QString &profileName) m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); m_mltConsumer->set("scrub_audio", 1); m_mltConsumer->set("preview_off", 1); + m_mltConsumer->set("audio_buffer", 512); m_mltConsumer->set("preview_format", mlt_image_rgb24a); } m_mltConsumer->set("buffer", "1"); @@ -288,7 +297,7 @@ void Render::buildConsumer(const QString &profileName) } m_mltConsumer->set("window_id", m_winid); } - m_mltConsumer->set("resize", 1); + //m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData()); m_mltConsumer->set("rescale", "nearest"); mlt_log_set_callback(kdenlive_callback); @@ -311,7 +320,6 @@ void Render::buildConsumer(const QString &profileName) if (!audioDriver.isEmpty()) m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData()); - m_mltConsumer->set("audio_buffer", 1024); m_mltConsumer->set("frequency", 48000); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); } @@ -342,7 +350,7 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) { m_refreshTimer.stop(); if (m_mltConsumer) { - if (m_externalConsumer == KdenliveSettings::external_display()) { + if (externalConsumer == KdenliveSettings::external_display()) { if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; QString videoDriver = KdenliveSettings::videodrivername(); QString currentDriver = m_mltConsumer->get("video_driver"); @@ -413,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 && !m_externalConsumer) { - refresh(); + if (m_paused && !externalConsumer) { + 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; @@ -610,14 +627,24 @@ void Render::slotSplitView(bool doit) void Render::getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer) { + // Make sure we don't request the info for same clip twice + m_infoMutex.lock(); + if (m_processingClipId.contains(clipId)) { + m_infoMutex.unlock(); + return; + } + for (int i = 0; i < m_requestList.count(); i++) { + if (m_requestList.at(i).clipId == clipId) { + // Clip is already queued + m_infoMutex.unlock(); + return; + } + } requestClipInfo info; info.xml = xml; info.clipId = clipId; info.imageHeight = imageHeight; info.replaceProducer = replaceProducer; - // Make sure we don't request the info for same clip twice - m_infoMutex.lock(); - m_requestList.removeAll(info); m_requestList.append(info); m_infoMutex.unlock(); if (!m_infoThread.isRunning()) { @@ -627,7 +654,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, in void Render::forceProcessing(const QString &id) { - if (m_processingClipId == id) return; + if (m_processingClipId.contains(id)) return; QMutexLocker lock(&m_infoMutex); for (int i = 0; i < m_requestList.count(); i++) { requestClipInfo info = m_requestList.at(i); @@ -645,21 +672,22 @@ void Render::forceProcessing(const QString &id) int Render::processingItems() { QMutexLocker lock(&m_infoMutex); - int count = m_requestList.count(); - if (!m_processingClipId.isEmpty()) { - // one clip is currently processed - count++; - } + int count = m_requestList.count() + m_processingClipId.count(); return count; } +void Render::processingDone(const QString &id) +{ + QMutexLocker lock(&m_infoMutex); + m_processingClipId.removeAll(id); +} + bool Render::isProcessing(const QString &id) { - if (m_processingClipId == id) return true; + if (m_processingClipId.contains(id)) return true; QMutexLocker lock(&m_infoMutex); for (int i = 0; i < m_requestList.count(); i++) { - requestClipInfo info = m_requestList.at(i); - if (info.clipId == id) { + if (m_requestList.at(i).clipId == id) { return true; } } @@ -673,7 +701,7 @@ void Render::processFileProperties() while (!m_requestList.isEmpty()) { m_infoMutex.lock(); info = m_requestList.takeFirst(); - m_processingClipId = info.clipId; + m_processingClipId.append(info.clipId); m_infoMutex.unlock(); QString path; @@ -724,7 +752,7 @@ void Render::processFileProperties() if (producer == NULL || producer->is_blank() || !producer->is_valid()) { kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<set("out", info.xml.attribute("proxy_out").toInt()); if (producer->get_out() != info.xml.attribute("proxy_out").toInt()) { // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip - m_processingClipId.clear(); + m_processingClipId.removeAll(info.clipId); emit removeInvalidProxy(info.clipId, true); delete producer; continue; @@ -807,9 +835,17 @@ void Render::processFileProperties() length = info.xml.attribute("length").toInt(); clipOut = length - 1; } - else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt(); - producer->set("length", length); - duration = length; + else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt() + 1; + // Pass duration if it was forced + if (info.xml.hasAttribute("duration")) { + duration = info.xml.attribute("duration").toInt(); + if (length < duration) { + length = duration; + if (clipOut > 0) clipOut = length - 1; + } + } + if (duration == 0) duration = length; + producer->set("length", length); } if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut); @@ -835,7 +871,6 @@ void Render::processFileProperties() } if (frame) delete frame; } - m_processingClipId.clear(); emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer); continue; } @@ -950,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"; @@ -1058,10 +1098,8 @@ void Render::processFileProperties() metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); - m_processingClipId.clear(); emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer); } - m_processingClipId.clear(); } @@ -1204,11 +1242,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) @@ -1297,6 +1330,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); @@ -1528,8 +1562,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(); } @@ -1581,8 +1616,18 @@ void Render::switchPlay(bool play) m_mltConsumer->set("refresh", 1); } else if (!play) { m_paused = true; - m_mltProducer->set_speed(0.0); - //m_mltProducer->pause(); + 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(); + } } } @@ -1633,8 +1678,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; } @@ -1642,7 +1687,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; } @@ -1677,13 +1721,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); } } @@ -1743,15 +1788,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; } @@ -1801,24 +1854,26 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) } -void Render::showFrame(Mlt::Frame& frame) +void Render::showFrame(Mlt::Frame* frame) { int currentPos = m_mltConsumer->position(); if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; emit rendererPosition(currentPos); - if (frame.is_valid()) { + 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); + 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); + if (analyseAudio) showAudio(*frame); + delete frame; emit showImageSignal(qimage); - if (analyseAudio) showAudio(frame); - if (sendFrameForAnalysis && frame.get_frame()->convert_image) { + if (sendFrameForAnalysis) { emit frameUpdated(qimage.rgbSwapped()); } - } + } else delete frame; + showFrameSemaphore.release(); emit checkSeeking(); } @@ -1848,6 +1903,7 @@ void Render::showAudio(Mlt::Frame& frame) if (!frame.is_valid() || frame.get_int("test_audio") != 0) { return; } + mlt_audio_format audio_format = mlt_audio_s16; //FIXME: should not be hardcoded.. int freq = 48000; @@ -1923,6 +1979,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); } @@ -3271,7 +3331,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); @@ -3349,7 +3409,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; }