X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Frenderer.cpp;h=13fb831f09aa90bdbce921cff816c71f4707cb28;hb=7cd7234fe261491efe2f9e55be980c326ee0a002;hp=05eeb97c60ff6aa6832bac2fd20874d2d7031684;hpb=4c9eded6ec58b227e49aee05677c6c0125e22ba4;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 05eeb97c..13fb831f 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -29,7 +29,10 @@ #include "definitions.h" #include "slideshowclip.h" #include "profilesdialog.h" + +#ifdef USE_BLACKMAGIC #include "blackmagic/devices.h" +#endif #include @@ -64,9 +67,9 @@ static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list static void 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(); Mlt::Frame frame(frame_ptr); if (!frame.is_valid()) return; - self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); if (self->sendFrameForAnalysis && frame_ptr->convert_image) { self->emitFrameUpdated(frame); } @@ -100,14 +103,14 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ } } -Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) : +Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) : AbstractRender(rendererName, parent), - analyseAudio(KdenliveSettings::monitor_audio()), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltProfile(NULL), - m_framePosition(0), + m_showFrameEvent(NULL), + m_pauseEvent(NULL), m_externalConsumer(false), m_isZoneMode(false), m_isLoopMode(false), @@ -115,11 +118,15 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget m_blackClip(NULL), m_winid(winid) { + analyseAudio = KdenliveSettings::monitor_audio(); if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); buildConsumer(profile); m_mltProducer = m_blackClip->cut(0, 1); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); + m_refreshTimer.setSingleShot(true); + m_refreshTimer.setInterval(70); + connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); } Render::~Render() @@ -130,10 +137,12 @@ Render::~Render() void Render::closeMlt() -{ +{ //delete m_osdTimer; m_requestList.clear(); m_infoThread.waitForFinished(); + if (m_showFrameEvent) delete m_showFrameEvent; + if (m_pauseEvent) delete m_pauseEvent; if (m_mltConsumer) delete m_mltConsumer; if (m_mltProducer) delete m_mltProducer; /*if (m_mltProducer) { @@ -188,14 +197,14 @@ void Render::buildConsumer(const QString &profileName) setenv("MLT_PROFILE", tmp, 1); m_mltProfile = new Mlt::Profile(tmp); m_mltProfile->set_explicit(true); - kDebug()<<"// ********* PROFILE AR: "<dar(); 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") { + if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor) { +#ifdef USE_BLACKMAGIC // Use blackmagic card for video output QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName); int device = KdenliveSettings::blackmagic_output_device(); @@ -207,9 +216,8 @@ void Render::buildConsumer(const QString &profileName) delete[] tmp; if (m_mltConsumer->is_valid()) { m_externalConsumer = true; - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("buffer", 12); m_mltConsumer->set("deinterlace_method", "onefield"); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); mlt_log_set_callback(kdenlive_callback); @@ -217,6 +225,7 @@ void Render::buildConsumer(const QString &profileName) 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())); } +#endif } m_externalConsumer = false; QString videoDriver = KdenliveSettings::videodrivername(); @@ -236,12 +245,11 @@ void Render::buildConsumer(const QString &profileName) m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); m_mltConsumer->set("preview_off", 1); m_mltConsumer->set("preview_format", mlt_image_rgb24a); - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); } else { m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); - // FIXME: the event object returned by the listen gets leaked... - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); - 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("window_id", m_winid); } m_mltConsumer->set("resize", 1); @@ -291,10 +299,14 @@ Mlt::Producer *Render::invalidProducer(const QString &id) return clip; } +bool Render::hasProfile(const QString &profileName) const +{ + return m_activeProfile == profileName; +} + int Render::resetProfile(const QString &profileName, bool dropSceneList) { - QString scene; - if (!dropSceneList) scene = sceneList(); + m_refreshTimer.stop(); if (m_mltConsumer) { if (m_externalConsumer == KdenliveSettings::external_display()) { if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; @@ -312,9 +324,15 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); + if (m_showFrameEvent) delete m_showFrameEvent; + m_showFrameEvent = NULL; + if (m_pauseEvent) delete m_pauseEvent; + m_pauseEvent = NULL; delete m_mltConsumer; m_mltConsumer = NULL; } + QString scene; + if (!dropSceneList) scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); double current_dar = m_mltProfile->dar(); @@ -342,7 +360,7 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) buildConsumer(profileName); double new_fps = m_mltProfile->fps(); double new_dar = m_mltProfile->dar(); - + if (!dropSceneList) { // We need to recover our playlist if (current_fps != new_fps) { @@ -360,16 +378,22 @@ void Render::seek(GenTime time) { if (!m_mltProducer) return; + m_mltProducer->seek((int)(time.frames(m_fps))); - refresh(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } } void Render::seek(int time) { if (!m_mltProducer) return; + m_mltProducer->seek(time); - refresh(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } } //static @@ -423,7 +447,7 @@ QImage Render::extractFrame(int frame_position, QString path, int width, int hei else delete producer; } } - + if (!m_mltProducer || !path.isEmpty()) { QImage pix(width, height, QImage::Format_RGB32); pix.fill(Qt::black); @@ -561,15 +585,19 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, in 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); - if (!m_infoThread.isRunning()) + m_infoMutex.unlock(); + if (!m_infoThread.isRunning()) { m_infoThread = QtConcurrent::run(this, &Render::processFileProperties); + } } void Render::forceProcessing(const QString &id) { - m_infoMutex.lock(); + if (m_processingClipId == id) return; + QMutexLocker lock(&m_infoMutex); for (int i = 0; i < m_requestList.count(); i++) { requestClipInfo info = m_requestList.at(i); if (info.clipId == id) { @@ -581,16 +609,32 @@ void Render::forceProcessing(const QString &id) } } } - m_infoMutex.unlock(); } -int Render::processingItems() const +int Render::processingItems() { + QMutexLocker lock(&m_infoMutex); int count = m_requestList.count(); - if (m_infoThread.isRunning()) count++; + if (!m_processingClipId.isEmpty()) { + // one clip is currently processed + count++; + } return count; } +bool Render::isProcessing(const QString &id) +{ + if (m_processingClipId == 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) { + return true; + } + } + return false; +} + void Render::processFileProperties() { requestClipInfo info; @@ -598,13 +642,21 @@ void Render::processFileProperties() while (!m_requestList.isEmpty()) { m_infoMutex.lock(); info = m_requestList.takeFirst(); + m_processingClipId = info.clipId; m_infoMutex.unlock(); - if (info.replaceProducer) emit blockClipMonitor(info.clipId); + QString path; bool proxyProducer; if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") { path = info.xml.attribute("proxy"); - proxyProducer = true; + // Check for missing proxies + if (QFileInfo(path).size() <= 0) { + // proxy is missing, re-create it + emit requestProxy(info.clipId); + proxyProducer = false; + path = info.xml.attribute("resource"); + } + else proxyProducer = true; } else { path = info.xml.attribute("resource"); @@ -634,6 +686,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(); emit removeInvalidProxy(info.clipId, true); delete producer; continue; @@ -726,21 +780,34 @@ void Render::processFileProperties() if (info.xml.hasAttribute("templatetext")) producer->set("templatetext", info.xml.attribute("templatetext").toUtf8().constData()); - + + int imageWidth = (int)((double) info.imageHeight * m_mltProfile->width() / m_mltProfile->height() + 0.5); + int fullWidth = (int)((double) info.imageHeight * m_mltProfile->dar() + 0.5); + int frameNumber = info.xml.attribute("thumbnail", "-1").toInt(); + if ((!info.replaceProducer && info.xml.hasAttribute("file_hash")) || proxyProducer) { // Clip already has all properties - emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer, true); + if (proxyProducer) { + // Recreate clip thumb + if (frameNumber > 0) producer->seek(frameNumber); + Mlt::Frame *frame = producer->get_frame(); + if (frame && frame->is_valid()) { + QImage img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight); + emit replyGetImage(info.clipId, img); + } + if (frame) delete frame; + } + m_processingClipId.clear(); + emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer); continue; } - int imageWidth = (int)((double) info.imageHeight * m_mltProfile->width() / m_mltProfile->height() + 0.5); - int fullWidth = (int)((double) info.imageHeight * m_mltProfile->dar() + 0.5); stringMap filePropertyMap; stringMap metadataPropertyMap; + char property[200]; - int frameNumber = info.xml.attribute("thumbnail", "-1").toInt(); if (frameNumber > 0) producer->seek(frameNumber); - + duration = duration > 0 ? duration : producer->get_playtime(); filePropertyMap["duration"] = QString::number(duration); //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime(); @@ -791,9 +858,19 @@ void Render::processFileProperties() } } - if (producer->get_double("meta.media.frame_rate_den") > 0) { - filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); - } else filePropertyMap["fps"] = producer->get("source_fps"); + // Get frame rate + int vindex = producer->get_int("video_index"); + if (vindex > -1) { + snprintf(property, sizeof(property), "meta.media.%d.stream.frame_rate", vindex); + if (producer->get(property)) + filePropertyMap["fps"] = producer->get(property); + } + + if (!filePropertyMap.contains("fps")) { + if (producer->get_double("meta.media.frame_rate_den") > 0) { + filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); + } else filePropertyMap["fps"] = producer->get("source_fps"); + } Mlt::Frame *frame = producer->get_frame(); if (frame && frame->is_valid()) { @@ -826,19 +903,18 @@ void Render::processFileProperties() variance = -1; } } while (variance == -1); - if (frameNumber > -1) filePropertyMap["thumbnail"] = frameNumber; + delete frame; + if (frameNumber > -1) filePropertyMap["thumbnail"] = QString::number(frameNumber); emit replyGetImage(info.clipId, img); } else if (frame->get_int("test_audio") == 0) { emit replyGetImage(info.clipId, "audio-x-generic", fullWidth, info.imageHeight); filePropertyMap["type"] = "audio"; } } - delete frame; // Retrieve audio / video codec name - // If there is a - char property[200]; - if (producer->get_int("video_index") > -1) { + + if (vindex > -1) { /*if (context->duration == AV_NOPTS_VALUE) { kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION"; emit removeInvalidClip(clipId); @@ -846,11 +922,13 @@ void Render::processFileProperties() return; }*/ // Get the video_index - int default_video = producer->get_int("video_index"); int video_max = 0; int default_audio = producer->get_int("audio_index"); int audio_max = 0; + int scan = producer->get_int("meta.media.progressive"); + filePropertyMap["progressive"] = QString::number(scan); + // Find maximum stream index values for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) { snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix); @@ -860,21 +938,21 @@ void Render::processFileProperties() else if (type == "audio") audio_max = ix; } - filePropertyMap["default_video"] = QString::number(default_video); + filePropertyMap["default_video"] = QString::number(vindex); filePropertyMap["video_max"] = QString::number(video_max); filePropertyMap["default_audio"] = QString::number(default_audio); filePropertyMap["audio_max"] = QString::number(audio_max); - snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video); + 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", default_video); + snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); if (producer->get(property)) filePropertyMap["videocodec"] = producer->get(property); } QString query; - query = QString("meta.media.%1.codec.pix_fmt").arg(default_video); + query = QString("meta.media.%1.codec.pix_fmt").arg(vindex); filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData()); filePropertyMap["colorspace"] = producer->get("meta.media.colorspace"); @@ -903,8 +981,10 @@ 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(); } @@ -948,49 +1028,72 @@ void Render::initSceneList() int Render::setProducer(Mlt::Producer *producer, int position) { - kDebug()<<"//////////\n SET CLIP PRODUCER \n//////////"; + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); - if (m_winid == -1) return -1; - if (m_mltConsumer) { - if (!m_mltConsumer->is_stopped()) { - m_mltConsumer->stop(); - m_mltConsumer->purge(); - } - m_mltConsumer->set("refresh", 0); - } - else { + QString currentId; + int consumerPosition = 0; + if (m_winid == -1 || !m_mltConsumer) { + kDebug()<<" / / / / WARNING, MONITOR NOT READY"; + if (producer) delete producer; return -1; } - - if (m_mltProducer) { - m_mltProducer->set_speed(0); - delete m_mltProducer; - m_mltProducer = NULL; - emit stopped(); + m_mltConsumer->set("refresh", 0); + if (!m_mltConsumer->is_stopped()) { + m_mltConsumer->stop(); } + m_mltConsumer->purge(); + consumerPosition = m_mltConsumer->position(); + + blockSignals(true); - if (producer && producer->is_valid()) { - m_mltProducer = new Mlt::Producer(producer->get_producer()); - } else m_mltProducer = m_blackClip->cut(0, 1); + if (!producer || !producer->is_valid()) { + if (producer) delete producer; + producer = m_blackClip->cut(0, 1); + } - if (!m_mltProducer || !m_mltProducer->is_valid()) { + if (!producer || !producer->is_valid()) { kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; return -1; } + if (m_mltProducer) currentId = m_mltProducer->get("id"); + emit stopped(); + if (position == -1 && producer->get("id") == currentId) position = consumerPosition; + if (position != -1) producer->seek(position); int volume = KdenliveSettings::volume(); - m_mltProducer->set("meta.volume", (double)volume / 100); - m_fps = m_mltProducer->get_fps(); + producer->set("meta.volume", (double)volume / 100); + m_fps = producer->get_fps(); blockSignals(false); - int error = connectPlaylist(); - if (producer == NULL) { - return error; + m_mltConsumer->connect(*producer); + + if (m_mltProducer) { + m_mltProducer->set_speed(0); + delete m_mltProducer; + m_mltProducer = NULL; + } + m_mltProducer = producer; + m_mltProducer->set_speed(0); + emit durationChanged(m_mltProducer->get_playtime()); + if (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; + m_showFrameEvent = NULL; + if (m_pauseEvent) delete m_pauseEvent; + m_pauseEvent = NULL; + delete m_mltConsumer; + m_mltConsumer = NULL; + return -1; } - if (position != -1) { - m_mltProducer->seek(position); - emit rendererPosition(position); - } else emit rendererPosition((int) m_mltProducer->position()); - return error; + 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) @@ -1000,6 +1103,8 @@ int Render::setSceneList(QDomDocument list, int position) int Render::setSceneList(QString playlist, int position) { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_winid == -1) return -1; int error = 0; @@ -1110,10 +1215,11 @@ int Render::setSceneList(QString playlist, int position) } kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); - if (error == 0) error = connectPlaylist(); - else connectPlaylist(); + m_mltConsumer->connect(*m_mltProducer); + m_mltProducer->set_speed(0); fillSlowMotionProducers(); blockSignals(false); + emit durationChanged(m_mltProducer->get_playtime()); return error; //kDebug()<<"// SETSCN LST, POS: "<optimise(); xmlConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); + if (!prod.is_valid()) return QString(); bool split = m_isSplitView; if (split) slotSplitView(false); xmlConsumer.connect(prod); - xmlConsumer.start(); - while (!xmlConsumer.is_stopped()) {} + xmlConsumer.run(); playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist")); if (split) slotSplitView(true); return playlist; @@ -1164,10 +1271,11 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) QFile file(path); QDomDocument doc; doc.setContent(sceneList(), false); - if (!kdenliveData.isNull()) { + if (doc.isNull()) return false; + QDomElement root = doc.documentElement(); + if (!kdenliveData.isNull() && !root.isNull()) { // add Kdenlive specific tags - QDomNode mlt = doc.elementsByTagName("mlt").at(0); - mlt.appendChild(doc.importNode(kdenliveData, true)); + root.appendChild(doc.importNode(kdenliveData, true)); } if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { kWarning() << "////// ERROR writing to file: " << path; @@ -1187,7 +1295,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); - if (m_name == "clip") { + if (m_name == Kdenlive::clipMonitor) { Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y()); Mlt::Playlist list; list.insert_at(0, prod, 0); @@ -1214,44 +1322,6 @@ double Render::fps() const return m_fps; } -int Render::connectPlaylist() -{ - if (!m_mltConsumer) return -1; - //m_mltConsumer->set("refresh", "0"); - m_mltConsumer->connect(*m_mltProducer); - m_mltProducer->set_speed(0); - if (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.")); - delete m_mltConsumer; - m_mltConsumer = NULL; - return -1; - } - emit durationChanged(m_mltProducer->get_playtime()); - return 0; - //refresh(); -} - -void Render::refreshDisplay() -{ - - if (!m_mltProducer) return; - //m_mltConsumer->set("refresh", 0); - - //mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer()); - /*if (KdenliveSettings::osdtimecode()) { - mlt_properties_set_int( properties, "meta.attr.timecode", 1); - mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#"); - m_osdInfo->set("dynamic", "1"); - m_mltProducer->attach(*m_osdInfo); - } - else { - m_mltProducer->detach(*m_osdInfo); - m_osdInfo->set("dynamic", "0"); - }*/ - refresh(); -} - int Render::volume() const { if (!m_mltConsumer || !m_mltProducer) return -1; @@ -1291,41 +1361,44 @@ void Render::slotOsdTimeout() void Render::start() { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_winid == -1) { kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } - if (m_mltConsumer && m_mltConsumer->is_stopped()) { + if (!m_mltConsumer) 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.")); kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR"; } else { - refresh(); + m_mltConsumer->purge(); + m_mltConsumer->set("refresh", 1); } } } void Render::stop() { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_mltProducer == NULL) return; if (m_mltConsumer && !m_mltConsumer->is_stopped()) { - //kDebug() << "///////////// RENDER STOPPED: " << m_name; - //m_mltConsumer->set("refresh", 0); m_mltConsumer->stop(); - // delete m_mltConsumer; - // m_mltConsumer = NULL; + m_mltConsumer->purge(); } if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); - //m_mltProducer->set("out", m_mltProducer->get_length() - 1); - //kDebug() << m_mltProducer->get_length(); } } void Render::stop(const GenTime & startTime) { + m_refreshTimer.stop(); + QMutexLocker locker(&m_mutex); if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); @@ -1342,28 +1415,30 @@ void Render::pause() if (m_isZoneMode) resetZoneMode(); m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); - /* - The 2 lines below create a flicker loop - emit rendererPosition(m_framePosition); - m_mltProducer->seek(m_framePosition);*/ m_mltConsumer->purge(); } void Render::switchPlay(bool play) { + QMutexLocker locker(&m_mutex); if (!m_mltProducer || !m_mltConsumer) return; if (m_isZoneMode) resetZoneMode(); if (play && m_mltProducer->get_speed() == 0.0) { - if (m_name == "clip" && m_framePosition == (int) m_mltProducer->get_out()) m_mltProducer->seek(0); + if (m_name == Kdenlive::clipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0); + if (m_mltConsumer->is_stopped()) { + m_mltConsumer->start(); + } m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); - if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); } else if (!play) { - stop(); - m_mltConsumer->set("refresh", "0"); - m_framePosition++; - m_mltProducer->seek(m_framePosition); + 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(); @@ -1415,6 +1490,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) m_mltProducer->seek((int)(startTime.frames(m_fps))); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); + if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); m_isZoneMode = true; } @@ -1433,7 +1509,9 @@ void Render::seekToFrame(int pos) return; resetZoneMode(); m_mltProducer->seek(pos); - refresh(); + if (m_mltProducer->get_speed() == 0) { + refresh(); + } } void Render::seekToFrameDiff(int diff) @@ -1447,25 +1525,24 @@ void Render::seekToFrameDiff(int diff) void Render::doRefresh() { - // Use a Timer so that we don't refresh too much - if (m_mltConsumer) { - if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); - m_mltConsumer->set("refresh", 1); - } + if (m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start(); } void Render::refresh() { + QMutexLocker locker(&m_mutex); if (!m_mltProducer) return; if (m_mltConsumer) { - m_mltConsumer->set("refresh", 1); if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); + m_mltConsumer->purge(); + m_mltConsumer->set("refresh", 1); } } void Render::setDropFrames(bool show) { + QMutexLocker locker(&m_mutex); if (m_mltConsumer) { int dropFrames = KdenliveSettings::mltthreads(); if (show == false) dropFrames = -dropFrames; @@ -1482,7 +1559,7 @@ void Render::setDropFrames(bool show) } } -double Render::playSpeed() +double Render::playSpeed() const { if (m_mltProducer) return m_mltProducer->get_speed(); return 0.0; @@ -1496,30 +1573,32 @@ GenTime Render::seekPosition() const int Render::seekFramePosition() const { - if (m_mltProducer) return (int) m_mltProducer->position(); + //if (m_mltProducer) return (int) m_mltProducer->position(); + if (m_mltConsumer) return (int) m_mltConsumer->position(); return 0; } -const QString & Render::rendererName() const -{ - return m_name; -} - void Render::emitFrameUpdated(Mlt::Frame& frame) { - mlt_image_format format = mlt_image_rgb24; + 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); + + /*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); + memcpy(qimage.bits(), image, width * height * 3);*/ + emit frameUpdated(qimage.rgbSwapped()); } -void Render::emitFrameNumber(double position) +void Render::emitFrameNumber() { - m_framePosition = position; - emit rendererPosition((int) position); + if (m_mltConsumer) emit rendererPosition((int) m_mltConsumer->position()); } void Render::emitConsumerStopped() @@ -1528,7 +1607,7 @@ void Render::emitConsumerStopped() if (m_mltProducer) { double pos = m_mltProducer->position(); if (m_isLoopMode) play(m_loopStart); - else if (m_isZoneMode) resetZoneMode(); + //else if (m_isZoneMode) resetZoneMode(); emit rendererStopped((int) pos); } } @@ -1567,8 +1646,7 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) void Render::showFrame(Mlt::Frame& frame) { - m_framePosition = qMax(frame.get_int("_position"), 0); - emit rendererPosition((int) m_framePosition); + emit rendererPosition((int) m_mltConsumer->position()); mlt_image_format format = mlt_image_rgb24a; int width = 0; int height = 0; @@ -1833,19 +1911,30 @@ void Render::mltCutClip(int track, GenTime position) } -void Render::lock() +Mlt::Tractor *Render::lockService() { - if (!m_mltProducer) return; + // we are going to replace some clips, purge consumer + QMutexLocker locker(&m_mutex); + if (!m_mltProducer) return NULL; + 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; + return NULL; } service.lock(); + return new Mlt::Tractor(service); + } -void Render::unlock() +void Render::unlockService(Mlt::Tractor *tractor) { + if (tractor) { + delete tractor; + } if (!m_mltProducer) return; Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { @@ -1855,21 +1944,15 @@ void Render::unlock() service.unlock(); } -bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) +bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod) { // TODO: optimize - if (prod == NULL) { + if (prod == NULL || tractor == NULL) { kDebug() << "Cannot update clip with null producer //////"; return false; } - Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) { - kWarning() << "// TRACTOR PROBLEM"; - return false; - } - Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(tractor.count() - 1 - info.track)); + Mlt::Producer trackProducer(tractor->track(tractor->count() - 1 - info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int startPos = info.startPos.frames(m_fps); int clipIndex = trackPlaylist.get_clip_index_at(startPos); @@ -2731,7 +2814,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par service.lock(); for (int j = 0; j < params.count(); j++) { filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); - } + } delete clip; service.unlock(); @@ -3024,7 +3107,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) trackProducer.set("hide", 0); } if (audioMixingBroken) fixAudioMixing(tractor); - + tractor.multitrack()->refresh(); tractor.refresh(); refresh(); @@ -3185,35 +3268,26 @@ bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTim } -bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) +bool Render::mltUpdateClipProducer(Mlt::Tractor *tractor, int track, int pos, Mlt::Producer *prod) { - if (prod == NULL || !prod->is_valid()) { + if (prod == NULL || !prod->is_valid() || tractor == NULL || !tractor->is_valid()) { kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; return false; } - //kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; - Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) { - kWarning() << "// TRACTOR PROBLEM"; - return false; - } - service.lock(); - Mlt::Tractor tractor(service); - Mlt::Producer trackProducer(tractor.track(track)); + + Mlt::Producer trackProducer(tractor->track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(pos); Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); if (clipProducer == NULL || clipProducer->is_blank()) { kDebug() << "// ERROR UPDATING CLIP PROD"; delete clipProducer; - service.unlock(); return false; } Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); if (!clip || !clip->is_valid()) { if (clip) delete clip; delete clipProducer; - service.unlock(); return false; } // move all effects to the correct producer @@ -3221,7 +3295,6 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) trackPlaylist.insert_at(pos, clip, 1); delete clip; delete clipProducer; - service.unlock(); return true; } @@ -3995,7 +4068,7 @@ void Render::mltDeleteTrack(int ix) } tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); - setSceneList(doc.toString(), m_framePosition); + setSceneList(doc.toString(), m_mltConsumer->position()); emit refreshDocumentProducers(false, false); } @@ -4005,6 +4078,7 @@ void Render::updatePreviewSettings() kDebug() << "////// RESTARTING CONSUMER"; if (!m_mltConsumer || !m_mltProducer) return; if (m_mltProducer->get_playtime() == 0) return; + QMutexLocker locker(&m_mutex); Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) return; @@ -4105,11 +4179,14 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } } } - QDomElement tractor = doc.elementsByTagName("tractor").at(0).toElement(); - int out = tractor.attribute("out").toInt(); - out = factor * out + 0.5; - tractor.setAttribute("out", out); - emit durationChanged(out); + QDomElement root = doc.documentElement(); + if (!root.isNull()) { + QDomElement tractor = root.firstChildElement("tractor"); + int out = tractor.attribute("out").toInt(); + out = factor * out + 0.5; + tractor.setAttribute("out", out); + emit durationChanged(out); + } //kDebug() << "///////////////////////////// " << out << " \n" << doc.toString() << "\n-------------------------"; return doc.toString(); @@ -4130,6 +4207,48 @@ Mlt::Producer* Render::getProducer() return m_mltProducer; } +const QString Render::activeClipId() +{ + if (m_mltProducer) return m_mltProducer->get("id"); + return QString(); +} + +//static +bool Render::getBlackMagicDeviceList(KComboBox *devicelist) +{ + Mlt::Profile profile; + Mlt::Producer bm(profile, "decklink"); + int found_devices = 0; + if (bm.is_valid()) found_devices = bm.get_int("devices"); + if (found_devices <= 0) { + devicelist->setEnabled(false); + return false; + } + for (int i = 0; i < found_devices; i++) { + char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); + devicelist->addItem(bm.get(tmp)); + delete[] tmp; + } + return true; +} + +bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist) +{ + Mlt::Profile profile; + Mlt::Consumer bm(profile, "decklink"); + int found_devices = 0; + if (bm.is_valid()) found_devices = bm.get_int("devices"); + if (found_devices <= 0) { + devicelist->setEnabled(false); + return false; + } + for (int i = 0; i < found_devices; i++) { + char *tmp = qstrdup(QString("device.%1").arg(i).toUtf8().constData()); + devicelist->addItem(bm.get(tmp)); + delete[] tmp; + } + return true; +} #include "renderer.moc"