X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=3e7e53f113e958cf0d715afeb38d607bbc59cbf0;hb=7448dd52292cc53cd97ce3fdba5c26246faba3f1;hp=830488e8ea880f3be2929a4d726de53a817bd409;hpb=e3c8b9f3f1fe5433cee5b93c4ad9618194f9f660;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 830488e8..3e7e53f1 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -65,10 +65,11 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr #endif self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); - if (frame.get_double("_speed") == 0.0) self->emitConsumerStopped(); - else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { - self->pause(); - self->emitConsumerStopped(); + if (frame.get_double("_speed") == 0.0) { + self->emitConsumerStopped(); + } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + self->pause(); + self->emitConsumerStopped(); } } @@ -136,12 +137,10 @@ void Render::closeMlt() resource = mlt_properties_get(properties, "mlt_service"); } - int trackNb = tractor.count(); - while (trackNb > 0) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) { + Mlt::Producer trackProducer(tractor.track(trackNb)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); - trackNb--; } } mlt_service_unlock(service.get_service()); @@ -231,6 +230,8 @@ void Render::buildConsumer(const QString profileName) delete[] tmp; } + int volume = KdenliveSettings::volume(); + m_mltConsumer->set("volume", (float)volume / 100); m_mltConsumer->set("progressive", 1); m_mltConsumer->set("audio_buffer", 1024); @@ -242,19 +243,37 @@ void Render::buildConsumer(const QString profileName) } +Mlt::Producer *Render::invalidProducer(const QString &id) +{ + Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile , "colour", "red"); + char *tmp = decodedString(id); + clip->set("id", tmp); + delete[] tmp; + clip->set("mlt_type", "producer"); + return clip; +} + int Render::resetProfile(const QString profileName) { - if (!m_mltConsumer) return 0; - if (m_activeProfile == profileName) { - kDebug() << "reset to same profile, nothing to do"; - return 1; + if (m_mltConsumer) { + QString videoDriver = KdenliveSettings::videodrivername(); + QString currentDriver = m_mltConsumer->get("video_driver"); + if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel"; + QString background = KdenliveSettings::window_background().name(); + QString currentBackground = m_mltConsumer->get("window_background"); + int volume = KdenliveSettings::volume(); + int currentVolume = (int)(QString(m_mltConsumer->get("volume")).toDouble() * 100.0); + if (m_activeProfile == profileName && currentDriver == videoDriver && volume == currentVolume && background == currentBackground) { + kDebug() << "reset to same profile, nothing to do"; + return 1; + } + + if (m_isSplitView) slotSplitView(false); + if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); + m_mltConsumer->purge(); + delete m_mltConsumer; + m_mltConsumer = NULL; } - kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << profileName; //KdenliveSettings::current_profile(); - if (m_isSplitView) slotSplitView(false); - if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); - m_mltConsumer->purge(); - delete m_mltConsumer; - m_mltConsumer = NULL; QString scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); @@ -267,12 +286,10 @@ int Render::resetProfile(const QString profileName) Mlt::Service service(m_mltProducer->get_service()); if (service.type() == tractor_type) { Mlt::Tractor tractor(service); - int trackNb = tractor.count(); - while (trackNb > 0) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) { + Mlt::Producer trackProducer(tractor.track(trackNb)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); trackPlaylist.clear(); - trackNb--; } } @@ -312,7 +329,6 @@ int Render::resetProfile(const QString profileName) return 1; } -/** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */ void Render::seek(GenTime time) { if (!m_mltProducer) @@ -352,7 +368,7 @@ char *Render::decodedString(QString str) */ int Render::renderWidth() const { - return (int)(m_mltProfile->height() * m_mltProfile->dar()); + return (int)(m_mltProfile->height() * m_mltProfile->dar() + 0.5); } int Render::renderHeight() const @@ -528,8 +544,7 @@ void Render::slotSplitView(bool doit) if (service.type() != tractor_type || tractor.count() < 2) return; Mlt::Field *field = tractor.field(); if (doit) { - int screen = 0; - for (int i = 1; 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) { @@ -603,8 +618,8 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int char *tmp = decodedString("kdenlivetitle:" + xml.attribute("resource")); producer = new Mlt::Producer(*m_mltProfile, 0, tmp); delete[] tmp; - if (xml.hasAttribute("xmldata")) { - char *tmp = decodedString(xml.attribute("xmldata")); + if (producer && xml.hasAttribute("xmldata")) { + tmp = decodedString(xml.attribute("xmldata")); producer->set("xmldata", tmp); delete[] tmp; } @@ -677,7 +692,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int return; } - int width = (int)(imageHeight * m_mltProfile->dar()); + int width = (int)(imageHeight * m_mltProfile->dar() + 0.5); QMap < QString, QString > filePropertyMap; QMap < QString, QString > metadataPropertyMap; @@ -733,9 +748,9 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int mlt_image_format format = mlt_image_rgb24a; int frame_width = width; int frame_height = imageHeight; - QPixmap pix(width, imageHeight); uint8_t *data = frame->get_image(format, frame_width, frame_height, 0); QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32); + QPixmap pix(frame_width, frame_height); if (!image.isNull()) { pix = QPixmap::fromImage(image.rgbSwapped()); @@ -750,7 +765,7 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int filePropertyMap["type"] = "audio"; } } - + delete frame; // Retrieve audio / video codec name // If there is a @@ -828,16 +843,15 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); kDebug() << "REquested fuile info for: " << url.path(); - delete frame; + emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); // FIXME: should delete this to avoid a leak... //delete producer; } -/** Create the producer from the MLT XML QDomDocument */ #if 0 +/** Create the producer from the MLT XML QDomDocument */ void Render::initSceneList() { kDebug() << "-------- INIT SCENE LIST ------_"; @@ -874,9 +888,6 @@ void Render::initSceneList() } #endif - - -/** Create the producer from the MLT XML QDomDocument */ int Render::setProducer(Mlt::Producer *producer, int position) { if (m_winid == -1) return -1; @@ -908,24 +919,20 @@ int Render::setProducer(Mlt::Producer *producer, int position) m_fps = m_mltProducer->get_fps(); int error = connectPlaylist(); - + if (position != -1) { m_mltProducer->seek(position); emit rendererPosition(position); - } + } else emit rendererPosition((int) m_mltProducer->position()); m_isBlocked = false; return error; } - - -/** Create the producer from the MLT XML QDomDocument */ int Render::setSceneList(QDomDocument list, int position) { return setSceneList(list.toString(), position); } -/** Create the producer from the MLT XML QDomDocument */ int Render::setSceneList(QString playlist, int position) { if (m_winid == -1) return -1; @@ -934,16 +941,15 @@ int Render::setSceneList(QString playlist, int position) kDebug() << "////// RENDER, SET SCENE LIST: " << playlist; - if (m_mltConsumer == NULL) { + if (m_mltConsumer) { + if (!m_mltConsumer->is_stopped()) { + m_mltConsumer->stop(); + } + m_mltConsumer->set("refresh", 0); + } else { kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER"; - m_isBlocked = false; - return -1; - } - - if (!m_mltConsumer->is_stopped()) { - m_mltConsumer->stop(); + error = -1; } - m_mltConsumer->set("refresh", 0); if (m_mltProducer) { m_mltProducer->set_speed(0); @@ -972,12 +978,10 @@ int Render::setSceneList(QString playlist, int position) resource = mlt_properties_get(properties, "mlt_service"); } - int trackNb = tractor.count(); - while (trackNb > 0) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) { + Mlt::Producer trackProducer(tractor.track(trackNb)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); - trackNb--; } delete field; } @@ -1046,7 +1050,6 @@ int Render::setSceneList(QString playlist, int position) //if (position != 0) emit rendererPosition(position); } -/** Create the producer from the MLT XML QDomDocument */ const QString Render::sceneList() { QString playlist; @@ -1087,7 +1090,6 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData) return true; } - void Render::saveZone(KUrl url, QString desc, QPoint zone) { kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name; @@ -1136,9 +1138,8 @@ int Render::connectPlaylist() 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.")); - emit blockMonitors(); - delete m_mltProducer; - m_mltProducer = NULL; + delete m_mltConsumer; + m_mltConsumer = NULL; return -1; } emit durationChanged(m_mltProducer->get_playtime()); @@ -1205,10 +1206,8 @@ void Render::start() if (m_mltConsumer && m_mltConsumer->is_stopped()) { kDebug() << "----- MONITOR: " << m_name << " WAS 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.")); - emit blockMonitors(); - delete m_mltProducer; - m_mltProducer = NULL; + //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 { kDebug() << "----- MONITOR: " << m_name << " REFRESH"; m_isBlocked = false; @@ -1262,8 +1261,10 @@ void Render::pause() m_isBlocked = true; 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_mltProducer->seek(m_framePosition);*/ m_mltConsumer->purge(); } @@ -1274,13 +1275,14 @@ void Render::switchPlay() if (m_isZoneMode) resetZoneMode(); if (m_mltProducer->get_speed() == 0.0) { m_isBlocked = false; + if (m_name == "clip" && m_framePosition == (int) m_mltProducer->get_out()) m_mltProducer->seek(0); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); } else { m_isBlocked = true; m_mltConsumer->set("refresh", 0); m_mltProducer->set_speed(0.0); - emit rendererPosition(m_framePosition); + //emit rendererPosition(m_framePosition); m_mltProducer->seek(m_framePosition); m_mltConsumer->purge(); //kDebug()<<" ********* RENDER PAUSE: "<get_speed(); @@ -1338,7 +1340,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime) return; m_isBlocked = false; if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1; - m_mltProducer->set("out", stopTime.frames(m_fps)); + m_mltProducer->set("out", (int)(stopTime.frames(m_fps))); m_mltProducer->seek((int)(startTime.frames(m_fps))); m_mltProducer->set_speed(1.0); m_mltConsumer->set("refresh", 1); @@ -1403,9 +1405,7 @@ void Render::setDropFrames(bool show) m_mltConsumer->set("play.real_time", dropFrames); #endif if (m_mltConsumer->start() == -1) { - emit blockMonitors(); - delete m_mltProducer; - m_mltProducer = NULL; + kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; } } @@ -1434,12 +1434,14 @@ const QString & Render::rendererName() const return m_name; } - void Render::emitFrameNumber(double position) { + if (position == m_framePosition) { + emit frameUpdated((int) position); + return; + } m_framePosition = position; emit rendererPosition((int) position); - //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId)); } void Render::emitConsumerStopped() @@ -1455,14 +1457,11 @@ void Render::emitConsumerStopped() } } - - void Render::exportFileToFirewire(QString /*srcFileName*/, int /*port*/, GenTime /*startTime*/, GenTime /*endTime*/) { KMessageBox::sorry(0, i18n("Firewire is not enabled on your system.\n Please install Libiec61883 and recompile Kdenlive")); } - void Render::exportCurrentFrame(KUrl url, bool /*notify*/) { if (!m_mltProducer) { @@ -1502,8 +1501,9 @@ void Render::showFrame(Mlt::Frame& frame) } #endif -/** MLT PLAYLIST DIRECT MANIPULATON **/ - +/* + * MLT playlist direct manipulation. + */ void Render::mltCheckLength(Mlt::Tractor *tractor) { @@ -1558,6 +1558,34 @@ void Render::mltCheckLength(Mlt::Tractor *tractor) } } +Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element) +{ + if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod; + + // We want a slowmotion producer + double speed = element.attribute("speed", "1.0").toDouble(); + int strobe = element.attribute("strobe", "1").toInt(); + QString url = QString::fromUtf8(prod->get("resource")); + url.append('?' + QString::number(speed)); + if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); + Mlt::Producer *slowprod = m_slowmotionProducers.value(url); + if (!slowprod || slowprod->get_producer() == NULL) { + char *tmp = decodedString(url); + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); + if (strobe > 1) slowprod->set("strobe", strobe); + delete[] tmp; + QString id = prod->get("id"); + if (id.contains('_')) id = id.section('_', 0, 0); + QString producerid = "slowmotion:" + id + ':' + QString::number(speed); + if (strobe > 1) producerid.append(':' + QString::number(strobe)); + tmp = decodedString(producerid); + slowprod->set("id", tmp); + delete[] tmp; + m_slowmotionProducers.insert(url, slowprod); + } + return slowprod; +} + int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push) { if (m_mltProducer == NULL) { @@ -1589,36 +1617,14 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro int trackDuration = trackProducer.get_playtime() - 1; Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); //kDebug()<<"/// INSERT cLIP: "< 1) { - // We want a slowmotion producer - double speed = element.attribute("speed", "1.0").toDouble(); - int strobe = element.attribute("strobe", "1").toInt(); - QString url = QString::fromUtf8(prod->get("resource")); - url.append('?' + QString::number(speed)); - if (strobe > 1) url.append("&strobe=" + QString::number(strobe)); - Mlt::Producer *slowprod = m_slowmotionProducers.value(url); - if (!slowprod || slowprod->get_producer() == NULL) { - char *tmp = decodedString(url); - slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp); - if (strobe > 1) slowprod->set("strobe", strobe); - delete[] tmp; - QString id = prod->get("id"); - if (id.contains('_')) id = id.section('_', 0, 0); - QString producerid = "slowmotion:" + id + ':' + QString::number(speed); - if (strobe > 1) producerid.append(':' + QString::number(strobe)); - tmp = decodedString(producerid); - slowprod->set("id", tmp); - delete[] tmp; - m_slowmotionProducers.insert(url, slowprod); - } - prod = slowprod; - if (prod == NULL || !prod->is_valid()) { - mlt_service_unlock(service.get_service()); - return -1; - } + prod = checkSlowMotionProducer(prod, element); + if (prod == NULL || !prod->is_valid()) { + mlt_service_unlock(service.get_service()); + return -1; } + int cutPos = (int) info.cropStart.frames(m_fps); + if (cutPos < 0) cutPos = 0; int insertPos = (int) info.startPos.frames(m_fps); int cutDuration = (int)(info.endPos - info.startPos).frames(m_fps) - 1; Mlt::Producer *clip = prod->cut(cutPos, cutDuration + cutPos); @@ -1648,7 +1654,6 @@ int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *pro void Render::mltCutClip(int track, GenTime position) { - m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); @@ -1746,8 +1751,12 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int startPos = info.startPos.frames(m_fps); int clipIndex = trackPlaylist.get_clip_index_at(startPos); + if (trackPlaylist.is_blank(clipIndex)) { + kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << startPos; + return false; + } + mlt_service_lock(service.get_service()); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); - // keep effects QList filtersList; Mlt::Service sourceService(clip->get_service()); @@ -1760,8 +1769,21 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr ct++; filter = sourceService.filter(ct); } - if (!mltRemoveClip(info.track, info.startPos)) return false; - if (mltInsertClip(info, element, prod) == -1) return false; + + trackPlaylist.replace_with_blank(clipIndex); + delete clip; + //if (!mltRemoveClip(info.track, info.startPos)) return false; + prod = checkSlowMotionProducer(prod, element); + if (prod == NULL || !prod->is_valid()) { + mlt_service_unlock(service.get_service()); + return false; + } + Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps)); + trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1); + delete clip2; + + + //if (mltInsertClip(info, element, prod) == -1) return false; if (!filtersList.isEmpty()) { clipIndex = trackPlaylist.get_clip_index_at(startPos); Mlt::Producer *destclip = trackPlaylist.get_clip(clipIndex); @@ -1770,6 +1792,7 @@ bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *pr for (int i = 0; i < filtersList.count(); i++) destService.attach(*(filtersList.at(i))); } + mlt_service_unlock(service.get_service()); return true; } @@ -1943,14 +1966,12 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap resource = mlt_properties_get(properties, "mlt_service"); } } else { - int trackNb = tractor.count(); - while (trackNb > 1) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + for (int trackNb = tractor.count() - 1; trackNb >= 1; --trackNb) { + Mlt::Producer trackProducer(tractor.track(trackNb)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - //int clipNb = trackPlaylist.count(); - insertPos = trackClipStartList.value(trackNb - 1); + insertPos = trackClipStartList.value(trackNb); if (insertPos != -1) { insertPos += offset; @@ -1982,7 +2003,6 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap } trackPlaylist.consolidate_blanks(0); } - trackNb--; } // now move transitions mlt_service serv = m_mltProducer->parent().get_service(); @@ -2034,7 +2054,7 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) } } -int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, double speed, double oldspeed, int strobe, Mlt::Producer *prod) +int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, double speed, double /*oldspeed*/, int strobe, Mlt::Producer *prod) { m_isBlocked = true; int newLength = 0; @@ -2069,6 +2089,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou QString serv = clipparent.get("mlt_service"); QString id = clipparent.get("id"); + if (speed <= 0 && speed > -1) speed = 1.0; //kDebug() << "CLIP SERVICE: " << serv; if (serv == "avformat" && (speed != 1.0 || strobe > 1)) { mlt_service_lock(service.get_service()); @@ -2216,14 +2237,23 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps)); - Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (!clip) { kDebug() << " / / / CANNOT FIND CLIP TO REMOVE EFFECT"; - return success; + return false; } + Mlt::Service clipService(clip->get_service()); + int duration = clip->get_playtime(); + if (doRefresh) { + // Check if clip is visible in monitor + int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); + if (diff < 0 || diff > duration) doRefresh = false; + } delete clip; + // if (tag.startsWith("ladspa")) tag = "ladspa"; m_isBlocked = true; int ct = 0; @@ -2254,17 +2284,25 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (!clip) { return false; } + Mlt::Service clipService(clip->get_service()); m_isBlocked = true; int duration = clip->get_playtime(); bool updateIndex = false; + if (doRefresh) { + // Check if clip is visible in monitor + int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); + if (diff < 0 || diff > duration) doRefresh = false; + } delete clip; const int filter_ix = params.paramValue("kdenlive_ix").toInt(); + const QString region = params.paramValue("region"); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { @@ -2308,7 +2346,7 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para // create filter QString tag = params.paramValue("tag"); - kDebug() << " / / INSERTING EFFECT: " << tag; + kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region; if (tag.startsWith("ladspa")) tag = "ladspa"; char *filterTag = decodedString(tag); char *filterId = decodedString(params.paramValue("id")); @@ -2361,19 +2399,34 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para delete[] starttag; delete[] endtag; } else { - Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); - if (filter && filter->is_valid()) + Mlt::Filter *filter; + QString prefix; + if (!region.isEmpty()) { + filter = new Mlt::Filter(*m_mltProfile, "region"); + } else filter = new Mlt::Filter(*m_mltProfile, filterTag); + if (filter && filter->is_valid()) { filter->set("kdenlive_id", filterId); - else { + if (!region.isEmpty()) { + char *tmp = decodedString(region); + filter->set("resource", tmp); + tmp = decodedString(params.paramValue("kdenlive_ix")); + filter->set("kdenlive_ix", tmp); + filter->set("filter0", filterTag); + prefix = "filter0."; + delete[] tmp; + params.removeParam("id"); + params.removeParam("region"); + params.removeParam("kdenlive_ix"); + } + } else { kDebug() << "filter is NULL"; m_isBlocked = false; return false; } - params.removeParam("kdenlive_id"); for (int j = 0; j < params.count(); j++) { - char *name = decodedString(params.at(j).name()); + char *name = decodedString(prefix + params.at(j).name()); char *value = decodedString(params.at(j).value()); filter->set(name, value); delete[] name; @@ -2386,7 +2439,8 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para params.removeParam("id"); params.removeParam("kdenlive_ix"); params.removeParam("tag"); - params.removeParam("disabled"); + params.removeParam("disable"); + params.removeParam("region"); for (int j = 0; j < params.count(); j++) { effectArgs.append(' ' + params.at(j).value()); @@ -2421,7 +2475,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par QString index = params.paramValue("kdenlive_ix"); QString tag = params.paramValue("tag"); - if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") { + if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) { // This is a keyframe effect, to edit it, we remove it and re-add it. mltRemoveEffect(track, position, index, false); bool success = mltAddEffect(track, position, params); @@ -2430,24 +2484,27 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par // find filter Mlt::Service service(m_mltProducer->parent().get_service()); - Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps)); - Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (!clip) { kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); return false; } + Mlt::Service clipService(clip->get_service()); + int duration = clip->get_playtime(); + bool doRefresh = true; + // Check if clip is visible in monitor + int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); + if (diff < 0 || diff > duration) doRefresh = false; delete clip; m_isBlocked = true; int ct = 0; - Mlt::Filter *filter = clipService.filter(ct); - - /* - kDebug() << "EDITING FILTER: "<get("kdenlive_id") <<", IX: "<get("kdenlive_ix"); @@ -2455,9 +2512,10 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par filter = clipService.filter(ct); } kDebug() << "++++++++++++++++++++++++++"; - */ ct = 0; - filter = clipService.filter(ct); + filter = clipService.filter(ct); */ + + Mlt::Filter *filter = clipService.filter(ct); while (filter) { if (filter->get("kdenlive_ix") == index) { break; @@ -2474,9 +2532,12 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par m_isBlocked = false; return success; } + QString prefix; + QString ser = filter->get("mlt_service"); + if (ser == "region") prefix = "filter0."; mlt_service_lock(service.get_service()); for (int j = 0; j < params.count(); j++) { - char *name = decodedString(params.at(j).name()); + char *name = decodedString(prefix + params.at(j).name()); char *value = decodedString(params.at(j).value()); filter->set(name, value); delete[] name; @@ -2485,7 +2546,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par mlt_service_unlock(service.get_service()); m_isBlocked = false; - refresh(); + if (doRefresh) refresh(); return true; } @@ -2498,14 +2559,22 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps)); - Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (!clip) { kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); return; } + Mlt::Service clipService(clip->get_service()); + int duration = clip->get_playtime(); + bool doRefresh = true; + // Check if clip is visible in monitor + int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); + if (diff < 0 || diff > duration) doRefresh = false; delete clip; + m_isBlocked = true; int ct = 0; Mlt::Filter *filter = clipService.filter(ct); @@ -2518,7 +2587,7 @@ void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, in } m_isBlocked = false; - refresh(); + if (doRefresh) refresh(); } void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) @@ -2530,14 +2599,22 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps)); - Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps)); + + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); if (!clip) { kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps); return; } + Mlt::Service clipService(clip->get_service()); + int duration = clip->get_playtime(); + bool doRefresh = true; + // Check if clip is visible in monitor + int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position(); + if (diff < 0 || diff > duration) doRefresh = false; delete clip; + m_isBlocked = true; int ct = 0; QList filtersList; @@ -2591,7 +2668,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) } m_isBlocked = false; - refresh(); + if (doRefresh) refresh(); } bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) @@ -2715,10 +2792,10 @@ bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) return false; } int previousStart = clip->get_in(); + int previousOut = clip->get_out(); delete clip; - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; m_isBlocked = true; - trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset); + trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset); m_isBlocked = false; mlt_service_unlock(service.get_service()); m_mltConsumer->set("refresh", 1); @@ -2740,23 +2817,29 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) mlt_service_lock(service.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps)); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); - if (clip == NULL) { + if (clip == NULL || clip->is_blank()) { kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!"; mlt_service_unlock(service.get_service()); return false; } int previousStart = clip->get_in(); + int previousOut = clip->get_out(); delete clip; - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; m_isBlocked = true; - kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame; - trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration); + previousStart += moveFrame; + if (previousStart < 0) { + // special case, in point becoming negative (resizing images) + previousOut -= previousStart; + previousStart = 0; + } + // kDebug() << "RESIZE, new start: " << previousStart << ", " << previousOut; + trackPlaylist.resize_clip(clipIndex, previousStart, previousOut); if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1); else { //int midpos = info.startPos.frames(m_fps) + moveFrame - 1; int blankIndex = clipIndex - 1; int blankLength = trackPlaylist.clip_length(blankIndex); - kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame; + // kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame; if (! trackPlaylist.is_blank(blankIndex)) { kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK"; } @@ -2800,8 +2883,7 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) kWarning() << "// TRACTOR PROBLEM"; return false; } - mlt_service_lock(m_mltConsumer->get_service()); - + mlt_service_lock(service.get_service()); Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); @@ -2810,23 +2892,29 @@ bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) if (clipProducer == NULL || clipProducer->is_blank()) { kDebug() << "// ERROR UPDATING CLIP PROD"; delete clipProducer; - mlt_service_unlock(m_mltConsumer->get_service()); + mlt_service_unlock(service.get_service()); m_isBlocked--; return false; } Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); - if (!clip) return false; + if (!clip || !clip->is_valid()) { + if (clip) delete clip; + delete clipProducer; + mlt_service_unlock(service.get_service()); + m_isBlocked--; + return false; + } // move all effects to the correct producer mltPasteEffects(clipProducer, clip); trackPlaylist.insert_at(pos, clip, 1); delete clip; delete clipProducer; - mlt_service_unlock(m_mltConsumer->get_service()); + mlt_service_unlock(service.get_service()); m_isBlocked--; return true; } -bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool insert) +bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool /*insert*/) { m_isBlocked++; @@ -2845,10 +2933,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 (!overwrite && (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || clipProducer->is_blank())) { + if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) { // error, destination is not empty - if (!trackPlaylist.is_blank_at(moveEnd)) trackPlaylist.insert_at(moveStart, clipProducer, 1); - if (clipProducer) delete clipProducer; + if (clipProducer) { + if (!trackPlaylist.is_blank_at(moveEnd) && clipProducer->is_valid()) trackPlaylist.insert_at(moveStart, clipProducer, 1); + delete clipProducer; + } //int ix = trackPlaylist.get_clip_index_at(moveEnd); kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); @@ -2973,11 +3063,22 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n int new_in = (int)newIn.frames(m_fps); int new_out = (int)newOut.frames(m_fps) - 1; if (new_in >= new_out) return false; + int old_in = (int)oldIn.frames(m_fps); + int old_out = (int)oldOut.frames(m_fps) - 1; Mlt::Service service(m_mltProducer->parent().get_service()); Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); + bool doRefresh = true; + // Check if clip is visible in monitor + int diff = old_out - m_mltProducer->position(); + if (diff < 0 || diff > old_out - old_in) doRefresh = false; + if (doRefresh) { + diff = new_out - m_mltProducer->position(); + if (diff < 0 || diff > new_out - new_in) doRefresh = false; + } + m_isBlocked++; mlt_service_lock(service.get_service()); @@ -2985,7 +3086,7 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); QString mlt_type = mlt_properties_get(properties, "mlt_type"); QString resource = mlt_properties_get(properties, "mlt_service"); - int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2; + int old_pos = (int)(old_in + old_out) / 2; bool found = false; while (mlt_type == "transition") { @@ -3005,7 +3106,8 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n new_trans_props.inherit(trans_props); new_transition.set_in_and_out(new_in, new_out); field->disconnect_service(transition); - field->plant_transition(new_transition, newTransitionTrack, newTrack); + mltPlantTransition(field, new_transition, newTransitionTrack, newTrack); + //field->plant_transition(new_transition, newTransitionTrack, newTrack); } else transition.set_in_and_out(new_in, new_out); break; } @@ -3017,20 +3119,61 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n } mlt_service_unlock(service.get_service()); m_isBlocked--; - refresh(); + if (doRefresh) refresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); return found; } -void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) + +void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track) +{ + mlt_service nextservice = mlt_service_get_producer(field->get_service()); + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + QList trList; + + while (mlt_type == "transition") { + Mlt::Transition transition((mlt_transition) nextservice); + int aTrack = transition.get_a_track(); + int bTrack = transition.get_b_track(); + if (resource != "mix" && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) { + Mlt::Properties trans_props(transition.get_properties()); + char *tmp = decodedString(transition.get("mlt_service")); + Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, tmp); + delete[] tmp; + Mlt::Properties new_trans_props(cp->get_properties()); + new_trans_props.inherit(trans_props); + trList.append(cp); + field->disconnect_service(transition); + } + //else kDebug() << "// FOUND TRANS OK, "<plant_transition(tr, a_track, b_track); + + // re-add upper transitions + for (int i = 0; i < trList.count(); 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()); + } +} + +void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force) { - if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); + if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); else { mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false); mltAddTransition(tag, a_track, b_track, in, out, xml, false); } - refresh(); - //mltSavePlaylist(); + + if (m_mltProducer->position() > in.frames(m_fps) && m_mltProducer->position() < out.frames(m_fps)) refresh(); } void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) @@ -3325,6 +3468,8 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId); if (out != GenTime()) transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1); + + if (do_refresh && (m_mltProducer->position() < in.frames(m_fps) || m_mltProducer->position() > out.frames(m_fps))) do_refresh = false; QMap::Iterator it; QString key; if (xml.attribute("automatic") == "1") transition->set("automatic", 1); @@ -3341,8 +3486,9 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, delete[] name; delete[] value; } - // attach filter to the clip - field->plant_transition(*transition, a_track, b_track); + // attach transition + mltPlantTransition(field, *transition, a_track, b_track); + // field->plant_transition(*transition, a_track, b_track); delete[] transId; if (do_refresh) refresh(); return true; @@ -3534,13 +3680,13 @@ void Render::mltDeleteTrack(int ix) int a_track = mappedProps.value("a_track").toInt(); int b_track = mappedProps.value("b_track").toInt(); if (a_track > 0 && a_track >= ix) a_track --; - if (b_track > 0 && b_track > ix) b_track --; if (b_track == ix) { // transition was on the deleted track, so remove it tractor.removeChild(transitions.at(i)); i--; continue; } + if (b_track > 0 && b_track > ix) b_track --; for (int j = 0; j < props.count(); j++) { QDomElement f = props.at(j).toElement(); if (f.attribute("name") == "a_track") f.firstChild().setNodeValue(QString::number(a_track));