X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=be5edc3da6cb4112f9314be239e3a68b26d8b4ca;hb=95d462a785814fdffdd8b56e6acaacadfea650d0;hp=15673b70086f6e5a0ea35fee0a47fa41dd5c5a3d;hpb=ef8fbd60d3df78cf7ea0ec169623d42ac103b2ec;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 15673b70..be5edc3d 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -127,7 +127,8 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi m_isSplitView(false), m_blackClip(NULL), m_winid(winid), - m_paused(true) + m_paused(true), + m_isActive(false) { qRegisterMetaType ("stringMap"); analyseAudio = KdenliveSettings::monitor_audio(); @@ -139,9 +140,9 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi m_refreshTimer.setSingleShot(true); 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(multiStreamFound(QString,QList,QList,stringMap)), this, SLOT(slotMultiStreamProducerFound(QString,QList,QList,stringMap))); connect(this, SIGNAL(checkSeeking()), this, SLOT(slotCheckSeeking())); - connect(this, SIGNAL(mltFrameReceived(Mlt::Frame *)), this, SLOT(showFrame(Mlt::Frame *)), Qt::UniqueConnection); + connect(this, SIGNAL(mltFrameReceived(Mlt::Frame*)), this, SLOT(showFrame(Mlt::Frame*)), Qt::UniqueConnection); } Render::~Render() @@ -222,7 +223,7 @@ void Render::buildConsumer(const QString &profileName) setenv("MLT_PROFILE", m_activeProfile.toUtf8().constData(), 1); m_mltProfile->set_explicit(true); - m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black"); + m_blackClip = new Mlt::Producer(*m_mltProfile, "colour:black"); m_blackClip->set("id", "black"); m_blackClip->set("mlt_type", "producer"); if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor && m_winid != 0) { @@ -238,8 +239,8 @@ void Render::buildConsumer(const QString &profileName) if (m_mltConsumer->is_valid()) { externalConsumer = true; m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("deinterlace_method", "onefield"); - m_mltConsumer->set("rescale", "nearest"); + m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData()); + m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData()); m_mltConsumer->set("buffer", "1"); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); } @@ -273,7 +274,7 @@ void Render::buildConsumer(const QString &profileName) // Set defaults for decklink consumer if (m_mltConsumer) { m_mltConsumer->set("terminate_on_pause", 0); - m_mltConsumer->set("deinterlace_method", "onefield"); + m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData()); externalConsumer = true; } } @@ -299,7 +300,7 @@ void Render::buildConsumer(const QString &profileName) } //m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData()); - m_mltConsumer->set("rescale", "nearest"); + m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData()); mlt_log_set_callback(kdenlive_callback); QString audioDevice = KdenliveSettings::audiodevicename(); @@ -412,7 +413,7 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) void Render::seek(GenTime time) { - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; int pos = time.frames(m_fps); seek(pos); @@ -565,7 +566,7 @@ void Render::slotSplitView(bool doit) if (service.type() != tractor_type || tractor.count() < 2) return; Mlt::Field *field = tractor.field(); if (doit) { - for (int i = 1, screen = 0; i < tractor.count() && screen < 4; i++) { + for (int i = 1, screen = 0; i < tractor.count() && screen < 4; ++i) { Mlt::Producer trackProducer(tractor.track(i)); kDebug() << "// TRACK: " << i << ", HIDE: " << trackProducer.get("hide"); if (QString(trackProducer.get("hide")).toInt() != 1) { @@ -633,7 +634,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, in m_infoMutex.unlock(); return; } - for (int i = 0; i < m_requestList.count(); i++) { + for (int i = 0; i < m_requestList.count(); ++i) { if (m_requestList.at(i).clipId == clipId) { // Clip is already queued m_infoMutex.unlock(); @@ -656,7 +657,7 @@ void Render::forceProcessing(const QString &id) { if (m_processingClipId.contains(id)) return; QMutexLocker lock(&m_infoMutex); - for (int i = 0; i < m_requestList.count(); i++) { + for (int i = 0; i < m_requestList.count(); ++i) { requestClipInfo info = m_requestList.at(i); if (info.clipId == id) { if (i == 0) break; @@ -686,7 +687,7 @@ bool Render::isProcessing(const QString &id) { if (m_processingClipId.contains(id)) return true; QMutexLocker lock(&m_infoMutex); - for (int i = 0; i < m_requestList.count(); i++) { + for (int i = 0; i < m_requestList.count(); ++i) { if (m_requestList.at(i).clipId == id) { return true; } @@ -952,7 +953,7 @@ void Render::processFileProperties() int streams = producer->get_int("meta.media.nb_streams"); QList audio_list; QList video_list; - for (int i = 0; i < streams; i++) { + for (int i = 0; i < streams; ++i) { QByteArray propertyName = QString("meta.media.%1.stream.type").arg(i).toLocal8Bit(); QString type = producer->get(propertyName.data()); if (type == "audio") audio_list.append(i); @@ -1062,10 +1063,10 @@ void Render::processFileProperties() snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex); if (producer->get(property)) { filePropertyMap["videocodec"] = producer->get(property); - } else { - snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); - if (producer->get(property)) - filePropertyMap["videocodec"] = producer->get(property); + } + snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); + if (producer->get(property)) { + filePropertyMap["videocodecid"] = producer->get(property); } QString query; query = QString("meta.media.%1.codec.pix_fmt").arg(vindex); @@ -1094,7 +1095,7 @@ void Render::processFileProperties() for (int i = 0; i < count; i ++) { QString name = metadata.get_name(i); QString value = QString::fromUtf8(metadata.get(i)); - if (name.endsWith("markup") && !value.isEmpty()) + if (name.endsWith(".markup") && !value.isEmpty()) metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); @@ -1248,6 +1249,7 @@ void Render::startConsumer() { return; } m_mltConsumer->set("refresh", 1); + m_isActive = true; } int Render::setSceneList(QDomDocument list, int position) @@ -1550,7 +1552,10 @@ void Render::start() kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } - if (!m_mltConsumer) return; + if (!m_mltConsumer) { + kDebug()<<" / - - - STARTED BEFORE CONSUMER!!!"; + return; + } if (m_mltConsumer->is_stopped()) { if (m_mltConsumer->start() == -1) { //KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); @@ -1567,6 +1572,7 @@ void Render::stop() requestedSeekPosition = SEEK_INACTIVE; m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); + m_isActive = false; if (m_mltProducer == NULL) return; if (m_mltConsumer) { m_mltConsumer->set("refresh", 0); @@ -1585,6 +1591,7 @@ void Render::stop(const GenTime & startTime) requestedSeekPosition = SEEK_INACTIVE; m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); + m_isActive = false; if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); m_mltProducer->set_speed(0.0); @@ -1596,7 +1603,7 @@ void Render::stop(const GenTime & startTime) void Render::pause() { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; m_paused = true; m_mltProducer->set_speed(0.0); @@ -1605,11 +1612,16 @@ void Render::pause() m_mltProducer->seek(m_mltConsumer->position());*/ } +void Render::setActiveMonitor() +{ + if (!m_isActive) emit activateMonitor(m_name); +} + void Render::switchPlay(bool play) { QMutexLocker locker(&m_mutex); requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; if (m_isZoneMode) resetZoneMode(); if (play && m_paused) { @@ -1640,7 +1652,7 @@ void Render::switchPlay(bool play) void Render::play(double speed) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer) return; + if (!m_mltProducer || !m_isActive) return; double current_speed = m_mltProducer->get_speed(); if (current_speed == speed) return; if (m_isZoneMode) resetZoneMode(); @@ -1656,7 +1668,7 @@ void Render::play(double speed) void Render::play(const GenTime & startTime) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; m_paused = false; m_mltProducer->seek((int)(startTime.frames(m_fps))); @@ -1667,7 +1679,7 @@ void Render::play(const GenTime & startTime) void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; //m_mltProducer->set("eof", "loop"); m_isLoopMode = true; @@ -1678,7 +1690,7 @@ void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) void Render::playZone(const GenTime & startTime, const GenTime & stopTime) { requestedSeekPosition = SEEK_INACTIVE; - if (!m_mltProducer || !m_mltConsumer) + if (!m_mltProducer || !m_mltConsumer || !m_isActive) return; m_mltProducer->set("out", (int)(stopTime.frames(m_fps))); m_mltProducer->seek((int)(startTime.frames(m_fps))); @@ -1699,7 +1711,7 @@ void Render::resetZoneMode() void Render::seekToFrame(int pos) { - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; resetZoneMode(); seek(pos); @@ -1707,7 +1719,7 @@ void Render::seekToFrame(int pos) void Render::seekToFrameDiff(int diff) { - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; resetZoneMode(); if (requestedSeekPosition == SEEK_INACTIVE) @@ -1717,19 +1729,19 @@ void Render::seekToFrameDiff(int diff) void Render::refreshIfActive() { - if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused) m_refreshTimer.start(); + if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused && m_isActive) m_refreshTimer.start(); } void Render::doRefresh() { - if (m_mltProducer && m_paused) m_refreshTimer.start(); + if (m_mltProducer && m_paused && m_isActive) m_refreshTimer.start(); } void Render::refresh() { m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); - if (!m_mltProducer) + if (!m_mltProducer || !m_isActive) return; if (m_mltConsumer) { if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); @@ -1745,11 +1757,7 @@ void Render::setDropFrames(bool show) int dropFrames = KdenliveSettings::mltthreads(); if (show == false) dropFrames = -dropFrames; m_mltConsumer->stop(); - if (m_winid == 0) - m_mltConsumer->set("real_time", dropFrames); - else - m_mltConsumer->set("play.real_time", dropFrames); - + m_mltConsumer->set("real_time", dropFrames); if (m_mltConsumer->start() == -1) { kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; } @@ -1757,6 +1765,19 @@ void Render::setDropFrames(bool show) } } +void Render::setConsumerProperty(const QString &name, const QString &value) +{ + QMutexLocker locker(&m_mutex); + if (m_mltConsumer) { + m_mltConsumer->stop(); + m_mltConsumer->set(name.toUtf8().constData(), value.toUtf8().constData()); + if (m_isActive && m_mltConsumer->start() == -1) { + kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; + } + + } +} + bool Render::isPlaying() const { if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false; @@ -1785,13 +1806,13 @@ int Render::seekFramePosition() const void Render::emitFrameUpdated(Mlt::Frame& frame) { - mlt_image_format format = mlt_image_rgb24a; + mlt_image_format format = mlt_image_rgb24; int width = 0; int height = 0; const uchar* image = frame.get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); - memcpy(qimage.scanLine(0), image, width * height * 4); - emit frameUpdated(qimage.rgbSwapped()); + QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied); + memcpy(qimage.scanLine(0), image, width * height * 3); + emit frameUpdated(qimage); } int Render::getCurrentSeekPosition() const @@ -1803,13 +1824,15 @@ int Render::getCurrentSeekPosition() const void Render::emitFrameNumber() { int currentPos = m_mltConsumer->position(); - if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; + if (currentPos == requestedSeekPosition) { + requestedSeekPosition = SEEK_INACTIVE; + m_paused = true; + } emit rendererPosition(currentPos); if (requestedSeekPosition != SEEK_INACTIVE) { m_mltConsumer->purge(); m_mltProducer->seek(requestedSeekPosition); - if (m_mltProducer->get_speed() == 0 && m_paused) { - m_paused = false; + if (m_mltProducer->get_speed() == 0 && !m_paused) { m_mltConsumer->set("refresh", 1); } requestedSeekPosition = SEEK_INACTIVE; @@ -1866,17 +1889,17 @@ void Render::showFrame(Mlt::Frame* frame) if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE; emit rendererPosition(currentPos); if (frame->is_valid()) { - mlt_image_format format = mlt_image_rgb24a; + mlt_image_format format = mlt_image_rgb24; int width = 0; int height = 0; const uchar* image = frame->get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); - memcpy(qimage.scanLine(0), image, width * height * 4); + QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied); + memcpy(qimage.scanLine(0), image, width * height * 3); if (analyseAudio) showAudio(*frame); delete frame; emit showImageSignal(qimage); if (sendFrameForAnalysis) { - emit frameUpdated(qimage.rgbSwapped()); + emit frameUpdated(qimage); } } else delete frame; showFrameSemaphore.release(); @@ -2072,6 +2095,7 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro int clipIndex = trackPlaylist.get_clip_index_at(insertPos); trackPlaylist.insert_blank(clipIndex, cutDuration); } + trackPlaylist.consolidate_blanks(0); int newIndex = trackPlaylist.insert_at(insertPos, clip, 1); delete clip; /*if (QString(prod->get("transparency")).toInt() == 1) @@ -2100,7 +2124,7 @@ bool Render::mltCutClip(int track, GenTime position) /* // Display playlist info kDebug()<<"//////////// BEFORE"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -2145,7 +2169,7 @@ bool Render::mltCutClip(int track, GenTime position) Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service")); if (dup && dup->is_valid()) { Mlt::Properties entries(filter->get_properties()); - for (int i = 0; i < entries.count(); i++) { + for (int i = 0; i < entries.count(); ++i) { dup->set(entries.get_name(i), entries.get(i)); } dupService.attach(*dup); @@ -2157,7 +2181,7 @@ bool Render::mltCutClip(int track, GenTime position) return true; /* // Display playlist info kDebug()<<"//////////// AFTER"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -2241,7 +2265,7 @@ bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement ele delete clip2; if (!filtersList.isEmpty()) { - for (int i = 0; i < filtersList.count(); i++) + for (int i = 0; i < filtersList.count(); ++i) destService.attach(*(filtersList.at(i))); } return true; @@ -2251,12 +2275,13 @@ bool Render::mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement ele bool Render::mltRemoveClip(int track, GenTime position) { m_refreshTimer.stop(); + Mlt::Service service(m_mltProducer->parent().get_service()); if (service.type() != tractor_type) { kWarning() << "// TRACTOR PROBLEM"; return false; } - //service.lock(); + service.lock(); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -2264,7 +2289,7 @@ bool Render::mltRemoveClip(int track, GenTime position) if (trackPlaylist.is_blank(clipIndex)) { kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(m_fps); - //service.unlock(); + service.unlock(); return false; } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); @@ -2273,14 +2298,14 @@ bool Render::mltRemoveClip(int track, GenTime position) /* // Display playlist info kDebug()<<"//// AFTER"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; if (trackPlaylist.is_blank(i)) blk = "(blank)"; kDebug()<<"CLIP "< trackClipStartList, QMap /* kDebug()<<"-------------\nTRACK "<is_valid()) { + kDebug()<<"// Something is wrong with producer"; + return -1; + } service.lock(); Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); @@ -2827,10 +2856,10 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int filter = service.filter(ct); } - addFilterToService(service, params, duration); + bool success = addFilterToService(service, params, duration); // re-add following filters - for (int i = 0; i < filtersList.count(); i++) { + for (int i = 0; i < filtersList.count(); ++i) { Mlt::Filter *filter = filtersList.at(i); if (updateIndex) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); @@ -2838,7 +2867,7 @@ bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int } service.unlock(); if (doRefresh) refresh(); - return true; + return success; } @@ -2847,10 +2876,8 @@ bool Render::addFilterToService(Mlt::Service service, EffectsParameterList param // create filter QString tag = params.paramValue("tag"); //kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; - char *filterTag = qstrdup(tag.toUtf8().constData()); - char *filterId = qstrdup(params.paramValue("id").toUtf8().constData()); QString kfr = params.paramValue("keyframes"); - if (!kfr.isEmpty()) { + if (!kfr.isEmpty()) { QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts); //kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData()); @@ -2870,9 +2897,9 @@ bool Render::addFilterToService(Mlt::Service service, EffectsParameterList param int offset = 0; // Special case, only one keyframe, means we want a constant value if (keyFrames.count() == 1) { - Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData())); if (filter && filter->is_valid()) { - filter->set("kdenlive_id", filterId); + filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData())); int x1 = keyFrames.at(0).section(':', 0, 0).toInt(); double y1 = keyFrames.at(0).section(':', 1, 1).toDouble(); for (int j = 0; j < params.count(); j++) { @@ -2882,11 +2909,17 @@ bool Render::addFilterToService(Mlt::Service service, EffectsParameterList param //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, m_locale.toString(((min + y1) - paramOffset) / factor).toUtf8().data()); service.attach(*filter); - } + } else { + delete[] starttag; + delete[] endtag; + kDebug() << "filter is NULL"; + service.unlock(); + return false; + } } else for (int i = 0; i < keyFrames.size() - 1; ++i) { - Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData())); if (filter && filter->is_valid()) { - filter->set("kdenlive_id", filterId); + filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData())); int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset; double y1 = keyFrames.at(i).section(':', 1, 1).toDouble(); int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt(); @@ -2904,16 +2937,22 @@ bool Render::addFilterToService(Mlt::Service service, EffectsParameterList param filter->set(endtag, m_locale.toString(((min + y2) - paramOffset) / factor).toUtf8().data()); service.attach(*filter); offset = 1; - } + } else { + delete[] starttag; + delete[] endtag; + kDebug() << "filter is NULL"; + service.unlock(); + return false; + } } delete[] starttag; delete[] endtag; } else { Mlt::Filter *filter; QString prefix; - filter = new Mlt::Filter(*m_mltProfile, filterTag); + filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData())); if (filter && filter->is_valid()) { - filter->set("kdenlive_id", filterId); + filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData())); } else { kDebug() << "filter is NULL"; service.unlock(); @@ -2948,9 +2987,6 @@ bool Render::addFilterToService(Mlt::Service service, EffectsParameterList param // attach filter to the clip service.attach(*filter); } - - delete[] filterId; - delete[] filterTag; return true; } @@ -3270,7 +3306,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) } } - for (int i = 0; i < filtersList.count(); i++) { + for (int i = 0; i < filtersList.count(); ++i) { clipService.attach(*(filtersList.at(i))); } @@ -3331,7 +3367,7 @@ void Render::mltMoveTrackEffect(int track, int oldPos, int newPos) } } - for (int i = 0; i < filtersList.count(); i++) { + for (int i = 0; i < filtersList.count(); ++i) { clipService.attach(*(filtersList.at(i))); } refresh(); @@ -3346,7 +3382,7 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration, bool refresh) /* // Display playlist info kDebug()<<"//////////// BEFORE RESIZE"; - for (int i = 0; i < trackPlaylist.count(); i++) { + for (int i = 0; i < trackPlaylist.count(); ++i) { int blankStart = trackPlaylist.clip_start(i); int blankDuration = trackPlaylist.clip_length(i) - 1; QString blk; @@ -3455,7 +3491,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor) { - for (int i = 1; i < tractor.count(); i++) { + for (int i = 1; i < tractor.count(); ++i) { Mlt::Producer trackProducer(tractor.track(i)); if (trackProducer.get_int("hide") < 2) return i; } @@ -3492,7 +3528,7 @@ void Render::fixAudioMixing(Mlt::Tractor tractor) } // Re-add correct audio transitions - for (int i = lowestTrack + 1; i < tractor.count(); i++) { + for (int i = lowestTrack + 1; i < tractor.count(); ++i) { Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix"); transition->set("always_active", 1); transition->set("combine", 1); @@ -3661,6 +3697,12 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn bool checkLength = false; if (endTrack == startTrack) { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); + if (!clipProducer) { + kDebug() << "// Cannot get clip at index: "<is_valid() || clipProducer->is_blank()) { @@ -3686,12 +3728,12 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn service.unlock(); return false; } - } - - if (overwrite) { + } else { + // Overwrite mode trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime()); - int clipIndex = trackPlaylist.get_clip_index_at(moveEnd); - trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1); + int ix = trackPlaylist.get_clip_index_at(moveEnd); + trackPlaylist.insert_blank(ix, clipProducer->get_playtime() - 1); + trackPlaylist.consolidate_blanks(0); } int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); if (newIndex == -1) { @@ -3701,9 +3743,9 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn service.unlock(); return false; } - trackPlaylist.consolidate_blanks(1); + trackPlaylist.consolidate_blanks(0); delete clipProducer; - if (newIndex + 1 == trackPlaylist.count()) checkLength = true; + if (newIndex + 1 >= trackPlaylist.count()) checkLength = true; } else { Mlt::Producer destTrackProducer(tractor.track(endTrack)); Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service()); @@ -3747,6 +3789,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn destTrackPlaylist.remove_region(moveEnd, clip->get_playtime()); int clipIndex = destTrackPlaylist.get_clip_index_at(moveEnd); destTrackPlaylist.insert_blank(clipIndex, clip->get_playtime() - 1); + destTrackPlaylist.consolidate_blanks(0); } int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1); @@ -3789,7 +3832,7 @@ QList Render::checkTrackSequence(int track) Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipNb = trackPlaylist.count(); //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; - for (int i = 0; i < clipNb; i++) { + for (int i = 0; i < clipNb; ++i) { Mlt::Producer *c = trackPlaylist.get_clip(i); int pos = trackPlaylist.clip_start(i); if (!list.contains(pos)) list.append(pos); @@ -3842,11 +3885,11 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n Mlt::Properties trans_props(transition.get_properties()); Mlt::Transition new_transition(*m_mltProfile, transition.get("mlt_service")); Mlt::Properties new_trans_props(new_transition.get_properties()); - new_trans_props.inherit(trans_props); - new_transition.set_in_and_out(new_in, new_out); + // We cannot use MLT's property inherit because it also clones internal values like _unique_id which messes up the playlist + cloneProperties(new_trans_props, trans_props); + new_transition.set_in_and_out(new_in, new_out); field->disconnect_service(transition); mltPlantTransition(field, new_transition, newTransitionTrack, newTrack); - //field->plant_transition(new_transition, newTransitionTrack, newTrack); } else transition.set_in_and_out(new_in, new_out); break; } @@ -3861,6 +3904,20 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n return found; } +void Render::cloneProperties(Mlt::Properties &dest, Mlt::Properties &source) +{ + int count = source.count(); + int i = 0; + for ( i = 0; i < count; i ++ ) + { + char *value = source.get(i); + if ( value != NULL ) + { + char *name = source.get_name( i ); + if (name != NULL && name[0] != '_') dest.set(name, value); + } + } +} void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track) { @@ -3882,7 +3939,8 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr Mlt::Properties trans_props(transition.get_properties()); Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service")); Mlt::Properties new_trans_props(cp->get_properties()); - new_trans_props.inherit(trans_props); + //new_trans_props.inherit(trans_props); + cloneProperties(new_trans_props, trans_props); trList.append(cp); field->disconnect_service(transition); } @@ -3896,7 +3954,7 @@ void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_tr field->plant_transition(tr, a_track, b_track); // re-add upper transitions - for (int i = trList.count() - 1; i >= 0; i--) { + for (int i = trList.count() - 1; i >= 0; --i) { //kDebug()<< "REPLANT ON TK: "<get_a_track()<<", "<get_b_track(); field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track()); } @@ -3949,7 +4007,7 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G QStringList permanentProps; permanentProps << "factory" << "kdenlive_id" << "mlt_service" << "mlt_type" << "in"; permanentProps << "out" << "a_track" << "b_track"; - for (int i = 0; i < mlt_properties_count(transproperties); i++) { + for (int i = 0; i < mlt_properties_count(transproperties); ++i) { QString propName = mlt_properties_get_name(transproperties, i); if (!propName.startsWith('_') && ! permanentProps.contains(propName)) { mlt_properties_set(transproperties, propName.toUtf8().constData(), ""); @@ -4027,7 +4085,7 @@ QMap Render::mltGetTransitionParamsFromXml(QDomElement xml) { QDomNodeList attribs = xml.elementsByTagName("parameter"); QMap map; - for (int i = 0; i < attribs.count(); i++) { + for (int i = 0; i < attribs.count(); ++i) { QDomElement e = attribs.item(i).toElement(); QString name = e.attribute("name"); //kDebug()<<"-- TRANSITION PARAM: "< Render::mltGetTransitionParamsFromXml(QDomElement xml) if (values.size() > 0) txtNeu << (int)values[0].toDouble(); int i = 0; - for (i = 0; i < separators.size() && i + 1 < values.size(); i++) { + for (i = 0; i < separators.size() && i + 1 < values.size(); ++i) { txtNeu << separators[i]; txtNeu << (int)(values[i+1].toDouble()); } @@ -4262,7 +4320,7 @@ const QList Render::producersList() Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (!trackPlaylist.is_valid()) continue; int clipNb = trackPlaylist.count(); - for (int i = 0; i < clipNb; i++) { + for (int i = 0; i < clipNb; ++i) { Mlt::Producer *c = trackPlaylist.get_clip(i); if (c == NULL) continue; QString prodId = c->parent().get("id"); @@ -4295,7 +4353,7 @@ void Render::fillSlowMotionProducers() Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (!trackPlaylist.is_valid()) continue; int clipNb = trackPlaylist.count(); - for (int i = 0; i < clipNb; i++) { + for (int i = 0; i < clipNb; ++i) { Mlt::Producer *c = trackPlaylist.get_clip(i); Mlt::Producer *nprod = new Mlt::Producer(c->get_parent()); if (nprod) { @@ -4384,7 +4442,8 @@ QList Render::mltInsertTrack(int ix, bool videoTrack) Mlt::Properties trans_props(transition.get_properties()); Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service")); Mlt::Properties new_trans_props(cp->get_properties()); - new_trans_props.inherit(trans_props); + cloneProperties(new_trans_props, trans_props); + //new_trans_props.inherit(trans_props); if (trackChanged) { // Transition track needs to be adjusted @@ -4419,7 +4478,7 @@ QList Render::mltInsertTrack(int ix, bool videoTrack) mltPlantTransition(field, transition, 1, ct); // re-add transitions - for (int i = trList.count() - 1; i >= 0; i--) { + for (int i = trList.count() - 1; i >= 0; --i) { field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track()); } qDeleteAll(trList); @@ -4438,7 +4497,7 @@ void Render::mltDeleteTrack(int ix) QDomNode track = doc.elementsByTagName("track").at(ix); QDomNode tractor = doc.elementsByTagName("tractor").at(0); QDomNodeList transitions = doc.elementsByTagName("transition"); - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { QDomElement e = transitions.at(i).toElement(); QDomNodeList props = e.elementsByTagName("property"); QMap mappedProps; @@ -4448,7 +4507,7 @@ void Render::mltDeleteTrack(int ix) } if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) { tractor.removeChild(transitions.at(i)); - i--; + --i; } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) { // Transition needs to be moved int a_track = mappedProps.value("a_track").toInt(); @@ -4457,7 +4516,7 @@ void Render::mltDeleteTrack(int ix) if (b_track == ix) { // transition was on the deleted track, so remove it tractor.removeChild(transitions.at(i)); - i--; + --i; continue; } if (b_track > 0 && b_track > ix) b_track --; @@ -4508,7 +4567,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s double factor = new_fps / current_fps; QDomNodeList producers = doc.elementsByTagName("producer"); - for (int i = 0; i < producers.count(); i++) { + for (int i = 0; i < producers.count(); ++i) { QDomElement prod = producers.at(i).toElement(); prod.removeAttribute("in"); prod.removeAttribute("out"); @@ -4525,7 +4584,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList entries = doc.elementsByTagName("entry"); - for (int i = 0; i < entries.count(); i++) { + for (int i = 0; i < entries.count(); ++i) { QDomElement entry = entries.at(i).toElement(); int in = entry.attribute("in").toInt(); int out = entry.attribute("out").toInt(); @@ -4536,7 +4595,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList blanks = doc.elementsByTagName("blank"); - for (int i = 0; i < blanks.count(); i++) { + for (int i = 0; i < blanks.count(); ++i) { QDomElement blank = blanks.at(i).toElement(); int length = blank.attribute("length").toInt(); length = factor * length + 0.5; @@ -4544,7 +4603,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList filters = doc.elementsByTagName("filter"); - for (int i = 0; i < filters.count(); i++) { + for (int i = 0; i < filters.count(); ++i) { QDomElement filter = filters.at(i).toElement(); int in = filter.attribute("in").toInt(); int out = filter.attribute("out").toInt(); @@ -4555,7 +4614,7 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s } QDomNodeList transitions = doc.elementsByTagName("transition"); - for (int i = 0; i < transitions.count(); i++) { + for (int i = 0; i < transitions.count(); ++i) { QDomElement transition = transitions.at(i).toElement(); int in = transition.attribute("in").toInt(); int out = transition.attribute("out").toInt(); @@ -4633,7 +4692,7 @@ bool Render::getBlackMagicDeviceList(KComboBox *devicelist, bool force) return false; } KdenliveSettings::setDecklink_device_found(true); - for (int i = 0; i < found_devices; i++) { + 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; @@ -4657,7 +4716,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force) return false; } KdenliveSettings::setDecklink_device_found(true); - for (int i = 0; i < found_devices; i++) { + 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; @@ -4668,7 +4727,7 @@ bool Render::getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force) void Render::slotMultiStreamProducerFound(const QString path, QList audio_list, QList video_list, stringMap data) { if (KdenliveSettings::automultistreams()) { - for (int i = 1; i < video_list.count(); i++) { + for (int i = 1; i < video_list.count(); ++i) { int vindex = video_list.at(i); int aindex = 0; if (i <= audio_list.count() -1) { @@ -4724,7 +4783,7 @@ void Render::slotMultiStreamProducerFound(const QString path, QList audio_l } if (dialog.exec() == QDialog::Accepted) { // import selected streams - for (int i = 0; i < groupList.count(); i++) { + for (int i = 0; i < groupList.count(); ++i) { if (groupList.at(i)->isChecked()) { int vindex = groupList.at(i)->property("vindex").toInt(); int aindex = comboList.at(i)->itemData(comboList.at(i)->currentIndex()).toInt();