X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=80ae7c38cd97792af94b12325210b0dd0edbcd39;hb=ec00934b188e717301b9fe2477f9a0993f5fb982;hp=6eb6b50c47258aef977a1027a37e4a3885f8f980;hpb=cf40d5f869ecdec80d5d85f6cad97a901f8af7a1;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 6eb6b50c..80ae7c38 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -27,6 +27,7 @@ #include "kdenlivesettings.h" #include "kthumb.h" #include "definitions.h" +#include "slideshowclip.h" #include @@ -50,7 +51,7 @@ static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list { if (level > MLT_LOG_ERROR) return; QString error; - QApplication::postEvent(qApp->activeWindow() , new MltErrorEvent(error.vsprintf(fmt, vl).simplified())); + QApplication::postEvent(qApp->activeWindow(), new MltErrorEvent(error.vsprintf(fmt, vl).simplified())); va_end(vl); } @@ -63,8 +64,11 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr #ifdef Q_WS_MAC self->showFrame(frame); #endif - + self->showAudio(frame); self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); + if (self->sendFrameForAnalysis && frame_ptr->convert_image) { + self->emitFrameUpdated(frame); + } if (frame.get_double("_speed") == 0.0) { self->emitConsumerStopped(); } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { @@ -77,6 +81,7 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) : QObject(parent), m_isBlocked(0), + sendFrameForAnalysis(false), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), @@ -137,12 +142,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()); @@ -162,9 +165,8 @@ void Render::slotSwitchFullscreen() void Render::buildConsumer(const QString profileName) { - char *tmp; m_activeProfile = profileName; - tmp = decodedString(m_activeProfile); + char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); setenv("MLT_PROFILE", tmp, 1); delete m_blackClip; m_blackClip = NULL; @@ -187,18 +189,16 @@ void Render::buildConsumer(const QString profileName) //m_mltConsumer->set("fullscreen", 1); #ifdef Q_WS_MAC - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio"); + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); m_mltConsumer->set("preview_off", 1); m_mltConsumer->set("preview_format", mlt_image_rgb24a); #else - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); #endif m_mltConsumer->set("resize", 1); m_mltConsumer->set("window_id", m_winid); m_mltConsumer->set("terminate_on_pause", 1); - tmp = decodedString(KdenliveSettings::window_background().name()); - m_mltConsumer->set("window_background", tmp); - delete [] tmp; + m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData()); // FIXME: the event object returned by the listen gets leaked... m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); @@ -206,17 +206,11 @@ void Render::buildConsumer(const QString profileName) mlt_log_set_callback(kdenlive_callback); QString audioDevice = KdenliveSettings::audiodevicename(); - if (!audioDevice.isEmpty()) { - tmp = decodedString(audioDevice); - m_mltConsumer->set("audio_device", tmp); - delete[] tmp; - } + if (!audioDevice.isEmpty()) + m_mltConsumer->set("audio_device", audioDevice.toUtf8().constData()); - if (!videoDriver.isEmpty()) { - tmp = decodedString(videoDriver); - m_mltConsumer->set("video_driver", tmp); - delete[] tmp; - } + if (!videoDriver.isEmpty()) + m_mltConsumer->set("video_driver", videoDriver.toUtf8().constData()); QString audioDriver = KdenliveSettings::audiodrivername(); @@ -226,30 +220,41 @@ void Render::buildConsumer(const QString profileName) audioDriver = KdenliveSettings::autoaudiodrivername(); */ - if (!audioDriver.isEmpty()) { - tmp = decodedString(audioDriver); - m_mltConsumer->set("audio_driver", tmp); - delete[] tmp; - } + if (!audioDriver.isEmpty()) + m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData()); + int volume = KdenliveSettings::volume(); + m_mltConsumer->set("volume", (float)volume / 100); m_mltConsumer->set("progressive", 1); m_mltConsumer->set("audio_buffer", 1024); m_mltConsumer->set("frequency", 48000); - 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"); } +Mlt::Producer *Render::invalidProducer(const QString &id) +{ + Mlt::Producer *clip = new Mlt::Producer(*m_mltProfile, "colour", "red"); + clip->set("id", id.toUtf8().constData()); + clip->set("mlt_type", "producer"); + return clip; +} + int Render::resetProfile(const QString profileName) { 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"; - if (m_activeProfile == profileName && currentDriver == videoDriver) { + 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; } @@ -272,12 +277,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--; } } @@ -295,9 +298,7 @@ int Render::resetProfile(const QString profileName) setSceneList(scene, pos); // producers have changed (different profile), so reset them... emit refreshDocumentProducers(); - /*char *tmp = decodedString(scene); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp); - delete[] tmp; + /*Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", scene.toUtf8().constData()); m_mltProducer = producer; m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black"); m_mltProducer->optimise(); @@ -317,7 +318,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) @@ -327,16 +327,6 @@ void Render::seek(GenTime time) refresh(); } -//static -char *Render::decodedString(QString str) -{ - /*QCString fn = QFile::encodeName(str); - char *t = new char[fn.length() + 1]; - strcpy(t, (const char *)fn);*/ - - return (char *) qstrdup(str.toUtf8().data()); //toLatin1 -} - //static /*QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border) { QPixmap pix(width, height); @@ -355,9 +345,14 @@ char *Render::decodedString(QString str) return pix; } */ +int Render::frameRenderWidth() const +{ + return m_mltProfile->width(); +} + 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 @@ -403,10 +398,8 @@ QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/) //static QPixmap Render::getVideoThumbnail(char *profile, QString file, int frame_position, int width, int height) { QPixmap pix(width, height); - char *tmp = decodedString(file); Mlt::Profile *prof = new Mlt::Profile(profile); - Mlt::Producer m_producer(*prof, tmp); - delete[] tmp; + Mlt::Producer m_producer(*prof, file.toUtf8().constData()); if (m_producer.is_blank()) { pix.fill(Qt::black); return pix; @@ -428,9 +421,7 @@ QPixmap Render::getVideoThumbnail(char *profile, QString file, int frame_positio /* void Render::getImage(KUrl url, int frame_position, QPoint size) { - char *tmp = decodedString(url.path()); - Mlt::Producer m_producer(tmp); - delete[] tmp; + Mlt::Producer m_producer(url.path().toUtf8().constData()); if (m_producer.is_blank()) { return; } @@ -511,9 +502,7 @@ int Render::getLength() bool Render::isValid(KUrl url) { - char *tmp = decodedString(url.path()); - Mlt::Producer producer(*m_mltProfile, tmp); - delete[] tmp; + Mlt::Producer producer(*m_mltProfile, url.path().toUtf8().constData()); if (producer.is_blank()) return false; @@ -533,8 +522,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) { @@ -601,18 +589,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int return; }*/ if (xml.attribute("type").toInt() == COLOR) { - char *tmp = decodedString("colour:" + xml.attribute("colour")); - producer = new Mlt::Producer(*m_mltProfile, 0, tmp); - delete[] tmp; + producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData()); } else if (xml.attribute("type").toInt() == TEXT) { - 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")); - producer->set("xmldata", tmp); - delete[] tmp; - } + producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + xml.attribute("resource")).toUtf8().constData()); + if (producer && producer->is_valid() && xml.hasAttribute("xmldata")) + producer->set("xmldata", xml.attribute("xmldata").toUtf8().constData()); } else if (url.isEmpty()) { QDomDocument doc; QDomElement mlt = doc.createElement("mlt"); @@ -620,13 +601,9 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int doc.appendChild(mlt); mlt.appendChild(play); play.appendChild(doc.importNode(xml, true)); - char *tmp = decodedString(doc.toString()); - producer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp); - delete[] tmp; + producer = new Mlt::Producer(*m_mltProfile, "xml-string", doc.toString().toUtf8().constData()); } else { - char *tmp = decodedString(url.path()); - producer = new Mlt::Producer(*m_mltProfile, tmp); - delete[] tmp; + producer = new Mlt::Producer(*m_mltProfile, url.path().toUtf8().constData()); } if (producer == NULL || producer->is_blank() || !producer->is_valid()) { @@ -664,17 +641,18 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int if (aindex != 0) producer->set("audio_index", aindex); } - if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); + // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if outpoint is larger + if (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT + || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW) + producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1); - char *tmp = decodedString(clipId); - producer->set("id", tmp); - delete[] tmp; + if (xml.hasAttribute("out")) + producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt()); - if (xml.hasAttribute("templatetext")) { - char *tmp = decodedString(xml.attribute("templatetext")); - producer->set("templatetext", tmp); - delete[] tmp; - } + producer->set("id", clipId.toUtf8().constData()); + + if (xml.hasAttribute("templatetext")) + producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData()); if (!replaceProducer && xml.hasAttribute("file_hash")) { // Clip already has all properties @@ -682,7 +660,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; @@ -695,24 +673,47 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int Mlt::Frame *frame = producer->get_frame(); if (xml.attribute("type").toInt() == SLIDESHOW) { - if (xml.hasAttribute("ttl")) producer->set("ttl", xml.attribute("ttl").toInt()); + int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0; + if (ttl) producer->set("ttl", ttl); + if (!xml.attribute("animation").isEmpty()) { + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "affine"); + if (filter && filter->is_valid()) { + int cycle = ttl; + QString geometry = SlideshowClip::animationToGeometry(xml.attribute("animation"), cycle); + if (!geometry.isEmpty()) { + if (xml.attribute("animation").contains("low-pass")) { + Mlt::Filter *blur = new Mlt::Filter(*m_mltProfile, "boxblur"); + if (blur && blur->is_valid()) + producer->attach(*blur); + } + filter->set("transition.geometry", geometry.toUtf8().data()); + filter->set("transition.cycle", cycle); + producer->attach(*filter); + } + } + } if (xml.attribute("fade") == "1") { // user wants a fade effect to slideshow Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma"); if (filter && filter->is_valid()) { - if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1); - if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt()); + if (ttl) filter->set("cycle", ttl); + if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("duration", xml.attribute("luma_duration").toInt()); if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) { - char *tmp = decodedString(xml.attribute("luma_file")); - filter->set("luma.resource", tmp); - delete[] tmp; + filter->set("luma.resource", xml.attribute("luma_file").toUtf8().constData()); if (xml.hasAttribute("softness")) { int soft = xml.attribute("softness").toInt(); filter->set("luma.softness", (double) soft / 100.0); } } - Mlt::Service clipService(producer->get_service()); - clipService.attach(*filter); + producer->attach(*filter); + } + } + if (xml.attribute("crop") == "1") { + // user wants to center crop the slides + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "crop"); + if (filter && filter->is_valid()) { + filter->set("center", 1); + producer->attach(*filter); } } } @@ -738,12 +739,16 @@ 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); + QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied); + QPixmap pix; if (!image.isNull()) { - pix = QPixmap::fromImage(image.rgbSwapped()); + if (frame_width > (2 * width)) { + // there was a scaling problem, do it manually + QImage scaled = image.scaled(width, imageHeight); + pix = QPixmap::fromImage(scaled.rgbSwapped()); + } else pix = QPixmap::fromImage(image.rgbSwapped()); } else pix.fill(Qt::black); @@ -755,7 +760,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 @@ -833,16 +838,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 ------_"; @@ -879,9 +883,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; @@ -917,20 +918,16 @@ int Render::setProducer(Mlt::Producer *producer, int position) 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; @@ -976,12 +973,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; } @@ -996,15 +991,13 @@ int Render::setSceneList(QString playlist, int position) } blockSignals(true); - char *tmp = decodedString(playlist); - m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp); + m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData()); if (!m_mltProducer || !m_mltProducer->is_valid()) { - kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp; + kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData(); m_mltProducer = m_blackClip->cut(0, 50); error = -1; } - delete[] tmp; m_mltProducer->optimise(); @@ -1018,9 +1011,7 @@ int Render::setSceneList(QString playlist, int position) mlt_filter_close( filter ); m_osdInfo = new Mlt::Filter("data_show"); - tmp = decodedString(m_osdProfile); - m_osdInfo->set("resource", tmp); - delete[] tmp; + m_osdInfo->set("resource", m_osdProfile.toUtf8().constData()); mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer()); mlt_properties_set_int( properties, "meta.attr.timecode", 1); mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#"); @@ -1050,11 +1041,10 @@ 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; - Mlt::Consumer xmlConsumer(*m_mltProfile , "xml:kdenlive_playlist"); + Mlt::Consumer xmlConsumer(*m_mltProfile, "xml:kdenlive_playlist"); m_mltProducer->optimise(); xmlConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); @@ -1091,23 +1081,18 @@ 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; - char *tmppath = decodedString("xml:" + url.path()); - Mlt::Consumer xmlConsumer(*m_mltProfile , tmppath); + Mlt::Consumer xmlConsumer(*m_mltProfile, ("xml:" + url.path()).toUtf8().constData()); m_mltProducer->optimise(); - delete[] tmppath; xmlConsumer.set("terminate_on_pause", 1); if (m_name == "clip") { Mlt::Producer *prod = m_mltProducer->cut(zone.x(), zone.y()); - tmppath = decodedString(desc); Mlt::Playlist list; list.insert_at(0, prod, 0); delete prod; - list.set("title", tmppath); - delete[] tmppath; + list.set("title", desc.toUtf8().constData()); xmlConsumer.connect(list); } else { @@ -1117,9 +1102,7 @@ void Render::saveZone(KUrl url, QString desc, QPoint zone) if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";*/ //Mlt::Producer *prod = p1->cut(zone.x(), zone.y()); - tmppath = decodedString(desc); - //prod->set("title", tmppath); - delete[] tmppath; + //prod->set("title", desc.toUtf8().constData()); xmlConsumer.connect(*p1); //list); } @@ -1436,12 +1419,21 @@ const QString & Render::rendererName() const return m_name; } +void Render::emitFrameUpdated(Mlt::Frame& frame) +{ + 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); + memcpy(qimage.bits(), image, width * height * 4); + emit frameUpdated(qimage.rgbSwapped()); +} void Render::emitFrameNumber(double position) { 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() @@ -1457,14 +1449,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) { @@ -1498,14 +1487,57 @@ void Render::showFrame(Mlt::Frame& frame) int width = 0; int height = 0; const uchar* image = frame.get_image(format, width, height); - QImage qimage(width, height, QImage::Format_ARGB32); + QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); memcpy(qimage.scanLine(0), image, width * height * 4); emit showImageSignal(qimage); } #endif -/** MLT PLAYLIST DIRECT MANIPULATON **/ +void Render::showAudio(Mlt::Frame& frame) +{ + mlt_audio_format audio_format=mlt_audio_pcm; + int freq,num_channels,samples; + uint8_t* data=(uint8_t*)frame.get_audio(audio_format,freq,num_channels,samples); + if (!data) + return; + int value=0; + QByteArray channels; + + for (int i=0;i> 8 ); + break; + case 2: + value=( ((uint32_t*)data) [i] >> 16 ); + break; + case 3: + value=( ((float*)data) [i]*255); + break; + default: + value=0; + } + */ + long val=0; + int num_samples=20; + for (int s=0;s0) + emit showAudioSignal(channels); +} +/* + * MLT playlist direct manipulation. + */ void Render::mltCheckLength(Mlt::Tractor *tractor) { @@ -1560,6 +1592,30 @@ 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) { + slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", url.toUtf8().constData()); + if (strobe > 1) slowprod->set("strobe", strobe); + 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)); + slowprod->set("id", producerid.toUtf8().constData()); + 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) { @@ -1591,36 +1647,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); @@ -1650,7 +1684,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()); @@ -1748,22 +1781,39 @@ 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()); int ct = 0; Mlt::Filter *filter = sourceService.filter(ct); while (filter) { - if (filter->get("kdenlive_ix") != 0) { + if (filter->get_int("kdenlive_ix") != 0) { filtersList.append(filter); } 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); @@ -1772,6 +1822,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; } @@ -1945,14 +1996,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; @@ -1984,7 +2033,6 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap } trackPlaylist.consolidate_blanks(0); } - trackNb--; } // now move transitions mlt_service serv = m_mltProducer->parent().get_service(); @@ -2028,7 +2076,7 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) int ct = 0; Mlt::Filter *filter = sourceService.filter(ct); while (filter) { - if (filter->get("kdenlive_ix") != 0) { + if (filter->get_int("kdenlive_ix") != 0) { sourceService.detach(*filter); destService.attach(*filter); } else ct++; @@ -2071,6 +2119,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()); @@ -2079,15 +2128,11 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou 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("framebuffer:" + url); - slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp); + slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); if (strobe > 1) slowprod->set("strobe", strobe); - delete[] tmp; QString producerid = "slowmotion:" + id + ':' + QString::number(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); - tmp = decodedString(producerid); - slowprod->set("id", tmp); - delete[] tmp; + slowprod->set("id", producerid.toUtf8().constData()); // copy producer props double ar = original->parent().get_double("force_aspect_ratio"); if (ar != 0.0) slowprod->set("force_aspect_ratio", ar); @@ -2156,15 +2201,11 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou 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("framebuffer:" + url); - slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp); - delete[] tmp; + slowprod = new Mlt::Producer(*m_mltProfile, 0, ("framebuffer:" + url).toUtf8().constData()); slowprod->set("strobe", strobe); QString producerid = "slowmotion:" + id.section(':', 1, 1) + ':' + QString::number(speed); if (strobe > 1) producerid.append(':' + QString::number(strobe)); - tmp = decodedString(producerid); - slowprod->set("id", tmp); - delete[] tmp; + slowprod->set("id", producerid.toUtf8().constData()); // copy producer props double ar = original->parent().get_double("force_aspect_ratio"); if (ar != 0.0) slowprod->set("force_aspect_ratio", ar); @@ -2211,41 +2252,95 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou return newLength; } +bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex) +{ + Mlt::Service service(m_mltProducer->parent().get_service()); + bool success = false; + Mlt::Tractor tractor(service); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + Mlt::Service clipService(trackPlaylist.get_service()); + + m_isBlocked = true; + mlt_service_lock(service.get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) { + if (clipService.detach(*filter) == 0) success = true; + } else if (updateIndex) { + // Adjust the other effects index + if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + ct++; + } else ct++; + filter = clipService.filter(ct); + } + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + refresh(); + return success; +} + bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh) { + if (position < GenTime()) { + // Remove track effect + return mltRemoveTrackEffect(track, index, updateIndex); + } Mlt::Service service(m_mltProducer->parent().get_service()); bool success = false; 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; + mlt_service_lock(service.get_service()); int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) { + if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) { if (clipService.detach(*filter) == 0) success = true; //kDebug()<<"Deleted filter id:"<get("kdenlive_id")<<", ix:"<get("kdenlive_ix")<<", SERVICE:"<get("mlt_service"); } else if (updateIndex) { // Adjust the other effects index - if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1); + if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; } else ct++; filter = clipService.filter(ct); } m_isBlocked = false; + mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return success; } +bool Render::mltAddTrackEffect(int track, EffectsParameterList params) +{ + 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()); + Mlt::Service trackService(trackProducer.get_service()); //trackPlaylist + return mltAddEffect(trackService, params, 15000, true); +} + bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) { @@ -2256,41 +2351,56 @@ 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; + return mltAddEffect(clipService, params, duration, doRefresh); +} +bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh) +{ + bool updateIndex = false; const int filter_ix = params.paramValue("kdenlive_ix").toInt(); + const QString region = params.paramValue("region"); int ct = 0; - Mlt::Filter *filter = clipService.filter(ct); + m_isBlocked = true; + mlt_service_lock(service.get_service()); + + Mlt::Filter *filter = service.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() == filter_ix) { + if (filter->get_int("kdenlive_ix") == filter_ix) { // A filter at that position already existed, so we will increase all indexes later updateIndex = true; break; } ct++; - filter = clipService.filter(ct); + filter = service.filter(ct); } if (params.paramValue("id") == "speed") { // special case, speed effect is not really inserted, we just update the other effects index (kdenlive_ix) ct = 0; - filter = clipService.filter(ct); + filter = service.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { - if (updateIndex) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); + if (filter->get_int("kdenlive_ix") >= filter_ix) { + if (updateIndex) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); } ct++; - filter = clipService.filter(ct); + filter = service.filter(ct); } m_isBlocked = false; + mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return true; } @@ -2299,29 +2409,29 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para // temporarily remove all effects after insert point QList filtersList; ct = 0; - filter = clipService.filter(ct); + filter = service.filter(ct); while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) { + if (filter->get_int("kdenlive_ix") >= filter_ix) { filtersList.append(filter); - clipService.detach(*filter); + service.detach(*filter); } else ct++; - filter = clipService.filter(ct); + filter = service.filter(ct); } // 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")); + char *filterTag = qstrdup(tag.toUtf8().constData()); + char *filterId = qstrdup(params.paramValue("id").toUtf8().constData()); QHash::Iterator it; QString kfr = params.paramValue("keyframes"); if (!kfr.isEmpty()) { QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts); kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes"); - char *starttag = decodedString(params.paramValue("starttag", "start")); - char *endtag = decodedString(params.paramValue("endtag", "end")); + char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData()); + char *endtag = qstrdup(params.paramValue("endtag", "end").toUtf8().constData()); kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag; //double max = params.paramValue("max").toDouble(); double min = params.paramValue("min").toDouble(); @@ -2333,53 +2443,73 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para params.removeParam("max"); params.removeParam("factor"); int offset = 0; - for (int i = 0; i < keyFrames.size() - 1; ++i) { + // Special case, only one keyframe, means we want a constant value + if (keyFrames.count() == 1) { Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); if (filter && filter->is_valid()) { filter->set("kdenlive_id", filterId); - 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(); - double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble(); - if (x2 == -1) x2 = duration; - + 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++) { - char *name = decodedString(params.at(j).name()); - char *value = decodedString(params.at(j).value()); - filter->set(name, value); - delete[] name; - delete[] value; + filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData()); } - filter->set("in", x1); - filter->set("out", x2); //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); - filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); - clipService.attach(*filter); - offset = 1; + service.attach(*filter); + } + } else for (int i = 0; i < keyFrames.size() - 1; ++i) { + Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag); + if (filter && filter->is_valid()) { + filter->set("kdenlive_id", filterId); + 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(); + double y2 = keyFrames.at(i + 1).section(':', 1, 1).toDouble(); + if (x2 == -1) x2 = duration; + + for (int j = 0; j < params.count(); j++) { + filter->set(params.at(j).name().toUtf8().constData(), params.at(j).value().toUtf8().constData()); + } + + filter->set("in", x1); + filter->set("out", x2); + //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<set(starttag, QString::number((min + y1) / factor).toUtf8().data()); + filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data()); + service.attach(*filter); + offset = 1; + } } - } 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()) { + filter->set("resource", region.toUtf8().constData()); + filter->set("kdenlive_ix", params.paramValue("kdenlive_ix").toUtf8().constData()); + filter->set("filter0", filterTag); + prefix = "filter0."; + params.removeParam("id"); + params.removeParam("region"); + params.removeParam("kdenlive_ix"); + } + } else { kDebug() << "filter is NULL"; m_isBlocked = false; + mlt_service_unlock(service.get_service()); return false; } - params.removeParam("kdenlive_id"); for (int j = 0; j < params.count(); j++) { - char *name = decodedString(params.at(j).name()); - char *value = decodedString(params.at(j).value()); - filter->set(name, value); - delete[] name; - delete[] value; + filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); } if (tag == "sox") { @@ -2389,19 +2519,21 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para params.removeParam("kdenlive_ix"); params.removeParam("tag"); params.removeParam("disable"); + params.removeParam("region"); for (int j = 0; j < params.count(); j++) { effectArgs.append(' ' + params.at(j).value()); } //kDebug() << "SOX EFFECTS: " << effectArgs.simplified(); - char *value = decodedString(effectArgs.simplified()); - filter->set("effect", value); - delete[] value; + filter->set("effect", effectArgs.simplified().toUtf8().constData()); } + if (params.paramValue("id") == "pan_zoom") { + filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1); + } // attach filter to the clip - clipService.attach(*filter); + service.attach(*filter); } delete[] filterId; delete[] filterTag; @@ -2410,46 +2542,99 @@ bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList para for (int i = 0; i < filtersList.count(); i++) { Mlt::Filter *filter = filtersList.at(i); if (updateIndex) - filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1); - clipService.attach(*filter); + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); + service.attach(*filter); } m_isBlocked = false; + mlt_service_unlock(service.get_service()); if (doRefresh) refresh(); return true; } +bool Render::mltEditTrackEffect(int track, EffectsParameterList params) +{ + 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()); + Mlt::Service clipService(trackPlaylist.get_service()); + m_isBlocked = true; + int ct = 0; + QString index = params.paramValue("kdenlive_ix"); + QString tag = params.paramValue("tag"); + + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (filter->get_int("kdenlive_ix") == index.toInt()) { + break; + } + ct++; + filter = clipService.filter(ct); + } + + if (!filter) { + kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT! " << index << ", " << tag; + // filter was not found, it was probably a disabled filter, so add it to the correct place... + + bool success = false;//mltAddTrackEffect(track, params); + 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++) { + filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); + } + mlt_service_unlock(service.get_service()); + + m_isBlocked = false; + refresh(); + return true; + +} + bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) { 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); + bool success = mltRemoveEffect(track, position, index, false); + if (!success) kDebug() << "// ERROR Removing effect : " << index; + if (position < GenTime()) success = mltAddTrackEffect(track, params); + else success = mltAddEffect(track, position, params); + if (!success) kDebug() << "// ERROR Adding effect : " << index; return success; } - + if (position < GenTime()) { + return mltEditTrackEffect(track, params); + } // 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"); @@ -2457,11 +2642,12 @@ 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) { + if (filter->get_int("kdenlive_ix") == index.toInt()) { break; } ct++; @@ -2476,43 +2662,47 @@ 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 *value = decodedString(params.at(j).value()); - filter->set(name, value); - delete[] name; - delete[] value; + filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData()); } mlt_service_unlock(service.get_service()); m_isBlocked = false; - refresh(); + if (doRefresh) refresh(); return true; } void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos) { - - kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; 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; } + 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); while (filter) { - int pos = QString(filter->get("kdenlive_ix")).toInt(); + int pos = filter->get_int("kdenlive_ix"); if (pos == oldPos) { filter->set("kdenlive_ix", newPos); } else ct++; @@ -2520,26 +2710,35 @@ 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) { - - kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos; + if (position < GenTime()) { + mltMoveTrackEffect(track, oldPos, newPos); + return; + } 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; } + 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; @@ -2547,19 +2746,19 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) bool found = false; if (newPos > oldPos) { while (filter) { - if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) { + if (!found && filter->get_int("kdenlive_ix") == oldPos) { filter->set("kdenlive_ix", newPos); filtersList.append(filter); clipService.detach(*filter); filter = clipService.filter(ct); - while (filter && QString(filter->get("kdenlive_ix")).toInt() <= newPos) { - filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1); + while (filter && filter->get_int("kdenlive_ix") <= newPos) { + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); ct++; filter = clipService.filter(ct); } found = true; } - if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) { + if (filter && filter->get_int("kdenlive_ix") > newPos) { filtersList.append(filter); clipService.detach(*filter); } else ct++; @@ -2567,7 +2766,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) } } else { while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) { + if (filter->get_int("kdenlive_ix") == oldPos) { filter->set("kdenlive_ix", newPos); filtersList.append(filter); clipService.detach(*filter); @@ -2578,7 +2777,7 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) ct = 0; filter = clipService.filter(ct); while (filter) { - int pos = QString(filter->get("kdenlive_ix")).toInt(); + int pos = filter->get_int("kdenlive_ix"); if (pos >= newPos) { if (pos < oldPos) filter->set("kdenlive_ix", pos + 1); filtersList.append(filter); @@ -2592,6 +2791,70 @@ void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) clipService.attach(*(filtersList.at(i))); } + m_isBlocked = false; + if (doRefresh) refresh(); +} + +void Render::mltMoveTrackEffect(int track, int oldPos, int newPos) +{ + 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()); + + Mlt::Service clipService(trackPlaylist.get_service()); + + m_isBlocked = true; + int ct = 0; + QList filtersList; + Mlt::Filter *filter = clipService.filter(ct); + bool found = false; + if (newPos > oldPos) { + while (filter) { + if (!found && filter->get_int("kdenlive_ix") == oldPos) { + filter->set("kdenlive_ix", newPos); + filtersList.append(filter); + clipService.detach(*filter); + filter = clipService.filter(ct); + while (filter && filter->get_int("kdenlive_ix") <= newPos) { + filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1); + ct++; + filter = clipService.filter(ct); + } + found = true; + } + if (filter && filter->get_int("kdenlive_ix") > newPos) { + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } else { + while (filter) { + if (filter->get_int("kdenlive_ix") == oldPos) { + filter->set("kdenlive_ix", newPos); + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + + ct = 0; + filter = clipService.filter(ct); + while (filter) { + int pos = filter->get_int("kdenlive_ix"); + if (pos >= newPos) { + if (pos < oldPos) filter->set("kdenlive_ix", pos + 1); + filtersList.append(filter); + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } + + for (int i = 0; i < filtersList.count(); i++) { + clipService.attach(*(filtersList.at(i))); + } m_isBlocked = false; refresh(); } @@ -2623,18 +2886,26 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps)); //kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex); Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); + int previousStart = clip->get_in(); int newDuration = (int) clipDuration.frames(m_fps) - 1; int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1); - if (newDuration > clip->get_length()) { - clip->parent().set("length", newDuration + 1); - clip->parent().set("out", newDuration); - clip->set("length", newDuration + 1); + + int currentOut; + if (info.cropStart < GenTime()) + currentOut = newDuration - info.cropStart.frames(m_fps); + else + currentOut = newDuration + previousStart; + if (currentOut > clip->get_length()) { + clip->parent().set("length", currentOut + 1); + clip->parent().set("out", currentOut); + clip->set("length", currentOut + 1); } - if (newDuration > clip->get_out()) { + + /*if (newDuration > clip->get_out()) { clip->parent().set_in_and_out(0, newDuration + 1); clip->set_in_and_out(0, newDuration + 1); - } + }*/ delete clip; trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart); trackPlaylist.consolidate_blanks(0); @@ -2717,10 +2988,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); @@ -2742,23 +3013,39 @@ 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(); - delete clip; - int previousDuration = trackPlaylist.clip_length(clipIndex) - 1; + int previousOut = clip->get_out(); + m_isBlocked = true; - kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame; - trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration); - if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1); - else { + previousStart += moveFrame; + if (previousStart < 0) { + // special case, in point becoming negative (resizing images) + previousOut -= previousStart; + previousStart = 0; + } + + int length = previousOut + 1; + if (length > clip->get_length()) { + clip->parent().set("length", length + 1); + clip->parent().set("out", length); + clip->set("length", length + 1); + } + delete clip; + + // 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"; } @@ -2802,8 +3089,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()); @@ -2812,18 +3098,24 @@ 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; } @@ -2847,10 +3139,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()); @@ -2975,11 +3269,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()); @@ -2987,7 +3292,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") { @@ -3000,14 +3305,13 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n found = true; if (newTrack - startTrack != 0) { Mlt::Properties trans_props(transition.get_properties()); - char *tmp = decodedString(transition.get("mlt_service")); - Mlt::Transition new_transition(*m_mltProfile, tmp); - delete[] tmp; + 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); 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; } @@ -3019,20 +3323,59 @@ 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) { - if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml); + 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()); + 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); + 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 && !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) @@ -3062,24 +3405,34 @@ void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, G QMap::Iterator it; QString key; mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr); + + QString currentId = mlt_properties_get(transproperties, "kdenlive_id"); + if (currentId != xml.attribute("id")) { + // The transition ID is not the same, so reset all properties + mlt_properties_set(transproperties, "kdenlive_id", xml.attribute("id").toUtf8().constData()); + // Cleanup previous properties + 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++) { + QString propName = mlt_properties_get_name(transproperties, i); + if (!propName.startsWith('_') && ! permanentProps.contains(propName)) { + mlt_properties_set(transproperties, propName.toUtf8().constData(), ""); + } + } + } + mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt()); mlt_properties_set_int(transproperties, "automatic", xml.attribute("automatic", "0").toInt()); - // update the transition id in case it uses the same MLT service but different Kdenlive id - char *tmp = decodedString(xml.attribute("id")); - mlt_properties_set(transproperties, "kdenlive_id", tmp); - delete[] tmp; + if (currentBTrack != a_track) { - mlt_properties_set_int(properties, "a_track", a_track); + mlt_properties_set_int(transproperties, "a_track", a_track); } for (it = map.begin(); it != map.end(); ++it) { key = it.key(); - char *name = decodedString(key); - char *value = decodedString(it.value()); - mlt_properties_set(transproperties, name, value); - //kDebug() << " ------ UPDATING TRANS PARAM: " << name << ": " << value; + mlt_properties_set(transproperties, key.toUtf8().constData(), it.value().toUtf8().constData()); + //kDebug() << " ------ UPDATING TRANS PARAM: " << key.toUtf8().constData() << ": " << it.value().toUtf8().constData(); //filter->set("kdenlive_id", id); - delete[] name; - delete[] value; } break; } @@ -3323,10 +3676,11 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, Mlt::Tractor tractor(service); Mlt::Field *field = tractor.field(); - char *transId = decodedString(tag); - Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId); + Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, tag.toUtf8().constData()); 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); @@ -3336,16 +3690,13 @@ bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, for (it = args.begin(); it != args.end(); ++it) { key = it.key(); - char *name = decodedString(key); - char *value = decodedString(it.value()); - if (it.value().isEmpty() == false) transition->set(name, value); - //kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value; - delete[] name; - delete[] value; - } - // attach filter to the clip - field->plant_transition(*transition, a_track, b_track); - delete[] transId; + if (!it.value().isEmpty()) + transition->set(key.toUtf8().constData(), it.value().toUtf8().constData()); + //kDebug() << " ------ ADDING TRANS PARAM: " << key << ": " << it.value(); + } + // attach transition + mltPlantTransition(field, *transition, a_track, b_track); + // field->plant_transition(*transition, a_track, b_track); if (do_refresh) refresh(); return true; } @@ -3536,13 +3887,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)); @@ -3683,5 +4034,16 @@ QString Render::updateSceneListFps(double current_fps, double new_fps, QString s return doc.toString(); } + +void Render::sendFrameUpdate() +{ + if (m_mltProducer) { + Mlt::Frame * frame = m_mltProducer->get_frame(); + emitFrameUpdated(*frame); + delete frame; + } +} + + #include "renderer.moc"