X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=15673b70086f6e5a0ea35fee0a47fa41dd5c5a3d;hb=f15361123a17fd8bcd0f42aab9eabdd07e5acf7d;hp=7572a6b96cda27b62d73bb5fa6028b2d51fe16d1;hpb=f4590f90865a420ab607e0734225339e213c741a;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 7572a6b9..15673b70 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -30,10 +30,6 @@ #include "slideshowclip.h" #include "profilesdialog.h" -#ifdef USE_BLACKMAGIC -#include "blackmagic/devices.h" -#endif - #include #include @@ -57,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(); @@ -77,48 +74,60 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr if (self->analyseAudio) { self->showAudio(frame); } - if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + 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(); + self->emitConsumerStopped(true); } } - -static void consumer_paused(mlt_consumer, Render * self, mlt_frame /*frame_ptr*/) +/* +static void consumer_paused(mlt_consumer, Render * self, mlt_frame frame_ptr) { // detect if the producer has finished playing. Is there a better way to do it? - self->emitConsumerStopped(); -} - + Mlt::Frame frame(frame_ptr); + if (!frame.is_valid()) return; + if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + self->pause(); + self->emitConsumerStopped(true); + } + 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); - 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) self->emitConsumerStopped(); + else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + self->pause(); + self->emitConsumerStopped(true); } + 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), m_blackClip(NULL), - m_winid(winid) + m_winid(winid), + m_paused(true) { qRegisterMetaType ("stringMap"); analyseAudio = KdenliveSettings::monitor_audio(); @@ -128,9 +137,11 @@ 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())); + connect(this, SIGNAL(mltFrameReceived(Mlt::Frame *)), this, SLOT(showFrame(Mlt::Frame *)), Qt::UniqueConnection); } Render::~Render() @@ -214,32 +225,31 @@ void Render::buildConsumer(const QString &profileName) 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) { -#ifdef USE_BLACKMAGIC + if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor && m_winid != 0) { // Use blackmagic card for video output - QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName); int device = KdenliveSettings::blackmagic_output_device(); if (device >= 0) { - if (BMInterface::isSupportedProfile(device, profileProperties)) { - QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device()); - if (!m_mltConsumer) { - m_mltConsumer = new Mlt::Consumer(*m_mltProfile, decklink.toUtf8().constData()); - m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - mlt_log_set_callback(kdenlive_callback); - } - if (m_mltConsumer->is_valid()) { - m_externalConsumer = true; - m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("deinterlace_method", "onefield"); - m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); - } - 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())); + QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device()); + if (!m_mltConsumer) { + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, decklink.toUtf8().constData()); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + mlt_log_set_callback(kdenlive_callback); + } + 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("buffer", "1"); + m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); + } + 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())); } -#endif } - m_externalConsumer = false; + externalConsumer = false; QString videoDriver = KdenliveSettings::videodrivername(); if (!videoDriver.isEmpty()) { if (videoDriver == "x11_noaccel") { @@ -255,21 +265,39 @@ void Render::buildConsumer(const QString &profileName) if (m_winid == 0) { // OpenGL monitor if (!m_mltConsumer) { - m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); + if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor) { + int device = KdenliveSettings::blackmagic_output_device(); + if (device >= 0) { + QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device()); + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, decklink.toUtf8().constData()); + // Set defaults for decklink consumer + if (m_mltConsumer) { + m_mltConsumer->set("terminate_on_pause", 0); + m_mltConsumer->set("deinterlace_method", "onefield"); + externalConsumer = true; + } + } + } + if (!m_mltConsumer || !m_mltConsumer->is_valid()) { + 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"); m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); } - m_mltConsumer->set("preview_off", 1); - m_mltConsumer->set("preview_format", mlt_image_rgb24a); } else { if (!m_mltConsumer) { m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); - m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - m_pauseEvent = m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + //m_pauseEvent = m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); + m_mltConsumer->set("progressive", 1); } m_mltConsumer->set("window_id", m_winid); } - m_mltConsumer->set("resize", 1); - m_mltConsumer->set("terminate_on_pause", 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); @@ -292,8 +320,6 @@ void Render::buildConsumer(const QString &profileName) if (!audioDriver.isEmpty()) m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData()); - m_mltConsumer->set("progressive", 1); - m_mltConsumer->set("audio_buffer", 1024); m_mltConsumer->set("frequency", 48000); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); } @@ -324,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"); @@ -386,20 +412,30 @@ 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(); + time = qMax(0, time); + time = qMin(m_mltProducer->get_playtime(), time); if (requestedSeekPosition == SEEK_INACTIVE) { requestedSeekPosition = time; - m_mltProducer->seek(time); m_mltConsumer->purge(); - if (m_mltProducer->get_speed() == 0) { - refresh(); + m_mltProducer->seek(time); + 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; @@ -591,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()) { @@ -608,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); @@ -626,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; } } @@ -654,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; @@ -705,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; @@ -788,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); @@ -816,7 +871,6 @@ void Render::processFileProperties() } if (frame) delete frame; } - m_processingClipId.clear(); emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer); continue; } @@ -931,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"; @@ -1039,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(); } @@ -1084,6 +1141,12 @@ void Render::initSceneList() } #endif +void Render::loadUrl(const QString &url) +{ + Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile, url.toUtf8().constData()); + setProducer(producer, 0); +} + int Render::setProducer(Mlt::Producer *producer, int position) { m_refreshTimer.stop(); @@ -1096,8 +1159,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(); @@ -1108,6 +1173,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()) { @@ -1160,8 +1226,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; @@ -1170,18 +1245,9 @@ 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) @@ -1270,6 +1336,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); @@ -1501,8 +1568,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(); } @@ -1530,11 +1598,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) @@ -1544,43 +1612,45 @@ 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; + m_mltProducer->set_speed(1.0); if (m_mltConsumer->is_stopped()) { m_mltConsumer->start(); } - m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); } else if (!play) { - m_mltProducer->set_speed(0.0); - m_mltConsumer->set("refresh", 0); - 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);*/ + m_paused = true; + 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(); + } } } 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) @@ -1588,6 +1658,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); @@ -1608,53 +1679,62 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { requestedSeekPosition = SEEK_INACTIVE; if (!m_mltProducer || !m_mltConsumer) - return; - if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; + return; 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(); + m_mltConsumer->set("refresh", 1); m_isZoneMode = true; } void Render::resetZoneMode() { - if (!m_mltProducer || (!m_isZoneMode && !m_isLoopMode)) return; - m_mltProducer->set("out", m_originalOut); - //m_mltProducer->set("eof", "pause"); + if (!m_isZoneMode && !m_isLoopMode) return; + m_mltProducer->set("out", m_mltProducer->get_length()); m_isZoneMode = false; m_isLoopMode = false; } 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() { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (!m_mltProducer) return; if (m_mltConsumer) { if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); - m_mltConsumer->purge(); - m_mltConsumer->set("refresh", 1); + m_mltConsumer->set("refresh", 1); + //m_mltConsumer->purge(); } } @@ -1677,6 +1757,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(); @@ -1705,35 +1791,37 @@ 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()); } +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); - requestedSeekPosition = SEEK_INACTIVE; - if (m_mltProducer->get_speed() == 0) { - refresh(); + if (m_mltProducer->get_speed() == 0 && m_paused) { + m_paused = false; + m_mltConsumer->set("refresh", 1); } + requestedSeekPosition = SEEK_INACTIVE; } } -void Render::emitConsumerStopped() +void Render::emitConsumerStopped(bool forcePause) { // This is used to know when the playing stopped - if (m_mltProducer) { + if (m_mltProducer && (forcePause || (!m_paused && m_mltProducer->get_speed() == 0))) { double pos = m_mltProducer->position(); + m_paused = true; if (m_isLoopMode) play(m_loopStart); //else if (m_isZoneMode) resetZoneMode(); emit rendererStopped((int) pos); @@ -1772,19 +1860,37 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) } -void Render::showFrame(Mlt::Frame& frame) +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); + if (analyseAudio) showAudio(*frame); + delete frame; + emit showImageSignal(qimage); + if (sendFrameForAnalysis) { + emit frameUpdated(qimage.rgbSwapped()); + } + } else delete frame; + showFrameSemaphore.release(); + emit checkSeeking(); +} + +void Render::slotCheckSeeking() +{ + if (requestedSeekPosition != SEEK_INACTIVE) { + m_mltProducer->seek(requestedSeekPosition); + if (m_paused) { + refresh(); + } + requestedSeekPosition = SEEK_INACTIVE; } } @@ -1803,6 +1909,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; @@ -1835,6 +1942,7 @@ void Render::mltCheckLength(Mlt::Tractor *tractor) int trackNb = tractor->count(); int duration = 0; int trackDuration; + if (m_isZoneMode) resetZoneMode(); if (trackNb == 1) { Mlt::Producer trackProducer(tractor->track(0)); duration = trackProducer.get_playtime() - 1; @@ -1877,6 +1985,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); } @@ -1908,6 +2020,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; @@ -2057,15 +2170,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(); @@ -2139,6 +2250,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"; @@ -3225,7 +3337,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); @@ -3303,7 +3415,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; } @@ -4505,9 +4617,9 @@ const QString Render::activeClipId() } //static -bool Render::getBlackMagicDeviceList(KComboBox *devicelist) +bool Render::getBlackMagicDeviceList(KComboBox *devicelist, bool force) { - if (!KdenliveSettings::decklink_device_found()) return false; + if (!force && !KdenliveSettings::decklink_device_found()) return false; Mlt::Profile profile; Mlt::Producer bm(profile, "decklink"); int found_devices = 0; @@ -4520,6 +4632,7 @@ bool Render::getBlackMagicDeviceList(KComboBox *devicelist) devicelist->setEnabled(false); return false; } + KdenliveSettings::setDecklink_device_found(true); for (int i = 0; i < found_devices; i++) { char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); devicelist->addItem(bm.get(tmp)); @@ -4528,14 +4641,14 @@ bool Render::getBlackMagicDeviceList(KComboBox *devicelist) return true; } -bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist) +bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force) { - if (!KdenliveSettings::decklink_device_found()) return false; + if (!force && !KdenliveSettings::decklink_device_found()) return false; Mlt::Profile profile; Mlt::Consumer bm(profile, "decklink"); int found_devices = 0; if (bm.is_valid()) { - bm.set("list_devices", 1); + bm.set("list_devices", 1);; found_devices = bm.get_int("devices"); } else KdenliveSettings::setDecklink_device_found(false); @@ -4543,6 +4656,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist) devicelist->setEnabled(false); return false; } + KdenliveSettings::setDecklink_device_found(true); for (int i = 0; i < found_devices; i++) { char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); devicelist->addItem(bm.get(tmp)); @@ -4623,5 +4737,19 @@ void Render::slotMultiStreamProducerFound(const QString path, QList 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"