X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=2f554c903cd6eb8638ec6eb37605ebd7d110f722;hb=7893afa29547c481ca7e58363a7e82bdb824ebf8;hp=607f0d027e7bdb09d26030fbe18171e779233970;hpb=96a5834c0752434e8129f8e0d604f83155b0bd48;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 607f0d02..2f554c90 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 @@ -38,9 +39,11 @@ #include #include +#include #include -#include +#include +#include @@ -48,7 +51,8 @@ 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); } @@ -56,34 +60,56 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr { // detect if the producer has finished playing. Is there a better way to do it? if (self->m_isBlocked) return; - if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) { + Mlt::Frame frame(frame_ptr); + if (!frame.is_valid()) return; + self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); + if (self->sendFrameForAnalysis && frame_ptr->convert_image) { + self->emitFrameUpdated(frame); + } + self->showAudio(frame); + if (frame.get_double("_speed") == 0.0) { + self->emitConsumerStopped(); + } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + self->pause(); self->emitConsumerStopped(); - } else { - self->emitFrameNumber(mlt_frame_get_position(frame_ptr)); } } -Render::Render(const QString & rendererName, int winid, int /* extid */, QWidget *parent) : - QObject(parent), - m_isBlocked(0), - m_name(rendererName), - m_mltConsumer(NULL), - m_mltProducer(NULL), - m_framePosition(0), - m_isZoneMode(false), - m_isLoopMode(false), - m_isSplitView(false), - m_blackClip(NULL), - m_winid(winid) +static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) { - kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); + // detect if the producer has finished playing. Is there a better way to do it? + if (self->m_isBlocked) return; + Mlt::Frame frame(frame_ptr); + self->showFrame(frame); + if (frame.get_double("_speed") == 0.0) { + self->emitConsumerStopped(); + } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) { + self->pause(); + self->emitConsumerStopped(); + } +} +Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) : + QObject(parent), + m_isBlocked(0), + sendFrameForAnalysis(false), + m_name(rendererName), + m_mltConsumer(NULL), + m_mltProducer(NULL), + m_mltProfile(NULL), + m_framePosition(0), + m_isZoneMode(false), + m_isLoopMode(false), + m_isSplitView(false), + m_blackClip(NULL), + m_winid(winid) +{ /*if (rendererName == "project") m_monitorId = 10000; else m_monitorId = 10001;*/ /*m_osdTimer = new QTimer(this); connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/ - - buildConsumer(); + if (profile.isEmpty()) profile = KdenliveSettings::current_profile(); + buildConsumer(profile); m_mltProducer = m_blackClip->cut(0, 50); m_mltConsumer->connect(*m_mltProducer); @@ -101,18 +127,36 @@ void Render::closeMlt() { //delete m_osdTimer; if (m_mltProducer) { - Mlt::Service service(m_mltProducer->get_service()); + Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service_lock(service.get_service()); + if (service.type() == tractor_type) { Mlt::Tractor tractor(service); - int trackNb = tractor.count(); + Mlt::Field *field = tractor.field(); + mlt_service nextservice = mlt_service_get_producer(service.get_service()); + mlt_service nextservicetodisconnect; + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + // Delete all transitions + while (mlt_type == "transition") { + nextservicetodisconnect = nextservice; + nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); + nextservice = mlt_service_producer(nextservice); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } - while (trackNb > 1) { - 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--; + if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); } } + mlt_service_unlock(service.get_service()); } kDebug() << "// // // CLOSE RENDERER " << m_name; @@ -122,16 +166,21 @@ void Render::closeMlt() //delete m_osdInfo; } +void Render::slotSwitchFullscreen() +{ + if (m_mltConsumer) m_mltConsumer->set("full_screen", 1); +} -void Render::buildConsumer() +void Render::buildConsumer(const QString profileName) { - char *tmp; - m_activeProfile = KdenliveSettings::current_profile(); - tmp = decodedString(m_activeProfile); + m_activeProfile = profileName; + char *tmp = qstrdup(m_activeProfile.toUtf8().constData()); setenv("MLT_PROFILE", tmp, 1); delete m_blackClip; m_blackClip = NULL; + //TODO: uncomment following line when everything is clean + //if (m_mltProfile) delete m_mltProfile; m_mltProfile = new Mlt::Profile(tmp); delete[] tmp; @@ -146,31 +195,31 @@ void Render::buildConsumer() } setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); - m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); + //m_mltConsumer->set("fullscreen", 1); + if (m_winid == 0) { + // OpenGL monitor + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio"); + m_mltConsumer->set("preview_off", 1); + m_mltConsumer->set("preview_format", mlt_image_rgb24a); + m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show); + } else { + m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview"); + // FIXME: the event object returned by the listen gets leaked... + m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_mltConsumer->set("window_id", m_winid); + } 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; - - // FIXME: the event object returned by the listen gets leaked... - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData()); m_mltConsumer->set("rescale", "nearest"); 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(); @@ -180,71 +229,83 @@ void Render::buildConsumer() 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() +int Render::resetProfile(const QString profileName) { - if (!m_mltConsumer) return 0; - if (m_activeProfile == KdenliveSettings::current_profile()) { - 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: " << 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(); + delete m_blackClip; + m_blackClip = NULL; + if (m_mltProducer) { pos = m_mltProducer->position(); - Mlt::Service service(m_mltProducer->get_service()); if (service.type() == tractor_type) { Mlt::Tractor tractor(service); - int trackNb = tractor.count(); - while (trackNb > 1) { - 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--; } } - delete m_mltProducer; } m_mltProducer = NULL; - delete m_blackClip; - m_blackClip = NULL; - - if (m_mltProfile) delete m_mltProfile; - m_mltProfile = NULL; - - buildConsumer(); - + buildConsumer(profileName); + double new_fps = m_mltProfile->fps(); + if (current_fps != new_fps) { + // fps changed, we must update the scenelist positions + scene = updateSceneListFps(current_fps, new_fps, scene); + } //kDebug() << "//RESET WITHSCENE: " << scene; setSceneList(scene, pos); - - /*char *tmp = decodedString(scene); - Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp); - delete[] tmp; + // producers have changed (different profile), so reset them... + emit refreshDocumentProducers(); + /*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(); @@ -264,7 +325,6 @@ int Render::resetProfile() 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) @@ -274,16 +334,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); @@ -302,9 +352,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 @@ -312,14 +367,15 @@ int Render::renderHeight() const return m_mltProfile->height(); } -QPixmap Render::extractFrame(int frame_position, int width, int height) +QImage Render::extractFrame(int frame_position, int width, int height) { if (width == -1) { width = renderWidth(); height = renderHeight(); } else if (width % 2 == 1) width++; - QPixmap pix(width, height); + if (!m_mltProducer) { + QImage pix(width, height, QImage::Format_RGB32); pix.fill(Qt::black); return pix; } @@ -345,98 +401,6 @@ QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/) //pixmap = im.scaled(width, height); return pixmap; } -/* -//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; - if (m_producer.is_blank()) { - pix.fill(Qt::black); - return pix; - } - - Mlt::Filter m_convert(*prof, "avcolour_space"); - m_convert.set("forced", mlt_image_rgb24a); - m_producer.attach(m_convert); - m_producer.seek(frame_position); - Mlt::Frame * frame = m_producer.get_frame(); - if (frame) { - pix = frameThumbnail(frame, width, height, true); - delete frame; - } - if (prof) delete prof; - return pix; -} -*/ -/* -void Render::getImage(KUrl url, int frame_position, QPoint size) -{ - char *tmp = decodedString(url.path()); - Mlt::Producer m_producer(tmp); - delete[] tmp; - if (m_producer.is_blank()) { - return; - } - Mlt::Filter m_convert("avcolour_space"); - m_convert.set("forced", mlt_image_rgb24a); - m_producer.attach(m_convert); - m_producer.seek(frame_position); - - Mlt::Frame * frame = m_producer.get_frame(); - - if (frame) { - QPixmap pix = frameThumbnail(frame, size.x(), size.y(), true); - delete frame; - emit replyGetImage(url, frame_position, pix, size.x(), size.y()); - } -}*/ - -/* Create thumbnail for color */ -/*void Render::getImage(int id, QString color, QPoint size) -{ - QPixmap pixmap(size.x() - 2, size.y() - 2); - color = color.replace(0, 2, "#"); - color = color.left(7); - pixmap.fill(QColor(color)); - QPixmap result(size.x(), size.y()); - result.fill(Qt::black); - //copyBlt(&result, 1, 1, &pixmap, 0, 0, size.x() - 2, size.y() - 2); - emit replyGetImage(id, result, size.x(), size.y()); - -}*/ - -/* Create thumbnail for image */ -/*void Render::getImage(KUrl url, QPoint size) -{ - QImage im; - QPixmap pixmap; - if (url.fileName().startsWith(".all.")) { // check for slideshow - QString fileType = url.fileName().right(3); - QStringList more; - QStringList::Iterator it; - - QDir dir( url.directory() ); - more = dir.entryList( QDir::Files ); - for ( it = more.begin() ; it != more.end() ; ++it ) { - if ((*it).endsWith("."+fileType, Qt::CaseInsensitive)) { - if (!im.load(url.directory() + '/' + *it)) - kDebug()<<"++ ERROR LOADIN IMAGE: "<dar(); } + void Render::slotSplitView(bool doit) { m_isSplitView = doit; @@ -479,8 +442,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) { @@ -537,27 +499,21 @@ void Render::slotSplitView(bool doit) } } -void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer) +void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer) { KUrl url = KUrl(xml.attribute("resource", QString())); Mlt::Producer *producer = NULL; + //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n"; /*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) { emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer); 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"); @@ -565,13 +521,9 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo 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()) { @@ -585,6 +537,17 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo double aspect = xml.attribute("force_aspect_ratio").toDouble(); if (aspect > 0) producer->set("force_aspect_ratio", aspect); } + + if (xml.hasAttribute("force_fps")) { + double fps = xml.attribute("force_fps").toDouble(); + if (fps > 0) producer->set("force_fps", fps); + } + + if (xml.hasAttribute("force_progressive")) { + bool ok; + int progressive = xml.attribute("force_progressive").toInt(&ok); + if (ok) producer->set("force_progressive", progressive); + } if (xml.hasAttribute("threads")) { int threads = xml.attribute("threads").toInt(); if (threads != 1) producer->set("threads", threads); @@ -598,11 +561,18 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo 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()); + + 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 @@ -610,8 +580,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo return; } - int height = 50; - int width = (int)(height * m_mltProfile->dar()); + int width = (int)(imageHeight * m_mltProfile->dar() + 0.5); QMap < QString, QString > filePropertyMap; QMap < QString, QString > metadataPropertyMap; @@ -624,24 +593,47 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo 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); } } } @@ -666,25 +658,29 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo mlt_image_format format = mlt_image_rgb24a; int frame_width = width; - int frame_height = height; - QPixmap pix(width, height); + int frame_height = 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); emit replyGetImage(clipId, pix); } else if (frame->get_int("test_audio") == 0) { - QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height)); + QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, imageHeight)); emit replyGetImage(clipId, pixmap); filePropertyMap["type"] = "audio"; } } - + delete frame; // Retrieve audio / video codec name // If there is a @@ -761,17 +757,16 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo if (name.endsWith("markup") && !value.isEmpty()) metadataPropertyMap[ name.section('.', 0, -2)] = value; } - - emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); + producer->seek(0); 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 ------_"; @@ -808,9 +803,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; @@ -835,46 +827,43 @@ int Render::setProducer(Mlt::Producer *producer, int position) m_mltProducer->set("skip_loop_filter", "all"); m_mltProducer->set("skip_frame", "bidir"); }*/ - if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; + if (!m_mltProducer || !m_mltProducer->is_valid()) { + kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; + return -1; + } 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; m_isBlocked = true; - int error; - qDeleteAll(m_slowmotionProducers.values()); - m_slowmotionProducers.clear(); + int error = 0; - //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist; + 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(); - //m_mltConsumer->set("refresh", 0); + error = -1; } if (m_mltProducer) { @@ -882,17 +871,39 @@ int Render::setSceneList(QString playlist, int position) //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo); - Mlt::Service service(m_mltProducer->get_service()); + Mlt::Service service(m_mltProducer->parent().get_service()); + mlt_service_lock(service.get_service()); + if (service.type() == tractor_type) { Mlt::Tractor tractor(service); - int trackNb = tractor.count(); - while (trackNb > 1) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + Mlt::Field *field = tractor.field(); + mlt_service nextservice = mlt_service_get_producer(service.get_service()); + mlt_service nextservicetodisconnect; + mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice); + QString mlt_type = mlt_properties_get(properties, "mlt_type"); + QString resource = mlt_properties_get(properties, "mlt_service"); + // Delete all transitions + while (mlt_type == "transition") { + nextservicetodisconnect = nextservice; + nextservice = mlt_service_producer(nextservice); + mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect); + if (nextservice == NULL) break; + properties = MLT_SERVICE_PROPERTIES(nextservice); + mlt_type = mlt_properties_get(properties, "mlt_type"); + resource = mlt_properties_get(properties, "mlt_service"); + } + + 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--; + if (trackPlaylist.type() == playlist_type) trackPlaylist.clear(); } + delete field; } + mlt_service_unlock(service.get_service()); + + qDeleteAll(m_slowmotionProducers.values()); + m_slowmotionProducers.clear(); delete m_mltProducer; m_mltProducer = NULL; @@ -900,14 +911,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(); @@ -921,9 +931,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#"); @@ -941,22 +949,22 @@ int Render::setSceneList(QString playlist, int position) } kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); - error = connectPlaylist(); + if (error == 0) error = connectPlaylist(); + else connectPlaylist(); fillSlowMotionProducers(); m_isBlocked = false; blockSignals(false); - emit refreshDocumentProducers(); + return error; //kDebug()<<"// SETSCN LST, POS: "<optimise(); xmlConsumer.set("terminate_on_pause", 1); Mlt::Producer prod(m_mltProducer->get_producer()); @@ -993,23 +1001,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 { @@ -1019,9 +1022,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); } @@ -1042,9 +1043,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()); @@ -1111,10 +1111,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; @@ -1168,8 +1166,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(); } @@ -1180,13 +1180,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(); @@ -1244,7 +1245,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); @@ -1303,11 +1304,13 @@ void Render::setDropFrames(bool show) int dropFrames = 1; if (show == false) dropFrames = 0; m_mltConsumer->stop(); - m_mltConsumer->set("play.real_time", dropFrames); + if (m_winid == 0) + m_mltConsumer->set("real_time", dropFrames); + else + m_mltConsumer->set("play.real_time", dropFrames); + if (m_mltConsumer->start() == -1) { - emit blockMonitors(); - delete m_mltProducer; - m_mltProducer = NULL; + kDebug(QtWarningMsg) << "ERROR, Cannot start monitor"; } } @@ -1336,12 +1339,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() @@ -1357,14 +1369,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) { @@ -1391,125 +1400,224 @@ void Render::exportCurrentFrame(KUrl url, bool /*notify*/) //if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003)); } -/** MLT PLAYLIST DIRECT MANIPULATON **/ + +void Render::showFrame(Mlt::Frame& frame) +{ + m_framePosition = qMax(frame.get_int("_position"), 0); + emit rendererPosition((int) m_framePosition); + mlt_image_format format = mlt_image_rgb24a; + int width = 0; + int height = 0; + const uchar* image = frame.get_image(format, width, height); + QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied); + memcpy(qimage.scanLine(0), image, width * height * 4); + emit showImageSignal(qimage); + showAudio(frame); + if (sendFrameForAnalysis && frame.get_frame()->convert_image) { + emit frameUpdated(qimage.rgbSwapped()); + } +} + +void Render::showAudio(Mlt::Frame& frame) +{ + if (!frame.is_valid() || frame.get_int("test_audio") != 0) return; + mlt_audio_format audio_format = mlt_audio_pcm; + int freq = 0; + int num_channels = 0; + int samples = 0; + 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 < num_channels; i++) { + /* switch (audio_format) + { + case 0: + value=( ( (uint8_t*)data) [i] ); + break; + case 1: + value=( ( (uint16_t*)data) [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; s < samples; s += samples / num_samples) { + val += (data[i+s*num_channels] - 127); + } + channels.append(val / num_samples); + } -void Render::mltCheckLength() + if (samples > 0) + emit showAudioSignal(channels); +} + +/* + * MLT playlist direct manipulation. + */ + +void Render::mltCheckLength(Mlt::Tractor *tractor) { //kDebug()<<"checking track length: "<get_service()); - Mlt::Tractor tractor(service); - - int trackNb = tractor.count(); + int trackNb = tractor->count(); int duration = 0; int trackDuration; if (trackNb == 1) { - Mlt::Producer trackProducer(tractor.track(0)); + Mlt::Producer trackProducer(tractor->track(0)); duration = trackProducer.get_playtime() - 1; m_mltProducer->set("out", duration); emit durationChanged(duration); return; } while (trackNb > 1) { - Mlt::Producer trackProducer(tractor.track(trackNb - 1)); + Mlt::Producer trackProducer(tractor->track(trackNb - 1)); trackDuration = trackProducer.get_playtime() - 1; - //kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration; + // kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration; if (trackDuration > duration) duration = trackDuration; trackNb--; } - Mlt::Producer blackTrackProducer(tractor.track(0)); + Mlt::Producer blackTrackProducer(tractor->track(0)); if (blackTrackProducer.get_playtime() - 1 != duration) { Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service()); Mlt::Producer *blackclip = blackTrackPlaylist.get_clip(0); - if (blackclip && duration > blackclip->parent().get_length()) { - blackclip->parent().set("length", duration); - blackclip->parent().set("out", duration - 1); - blackclip->set("length", duration); + if (blackclip && blackclip->is_blank()) { + delete blackclip; + blackclip = NULL; } - if (blackclip == NULL || blackclip->is_blank() || blackTrackPlaylist.count() != 1) { + + if (blackclip == NULL || blackTrackPlaylist.count() != 1) { blackTrackPlaylist.clear(); - m_blackClip->set("length", duration); - m_blackClip->set("out", duration - 1); - blackTrackPlaylist.append(*m_blackClip, 0, duration - 1); - } else blackTrackPlaylist.resize_clip(0, 0, duration - 1); + m_blackClip->set("length", duration + 1); + m_blackClip->set("out", duration); + blackclip = m_blackClip->cut(0, duration); + blackTrackPlaylist.insert_at(0, blackclip, 1); + } else { + if (duration > blackclip->parent().get_length()) { + blackclip->parent().set("length", duration + 1); + blackclip->parent().set("out", duration); + blackclip->set("length", duration + 1); + } + blackTrackPlaylist.resize_clip(0, 0, duration); + } + delete blackclip; m_mltProducer->set("out", duration); emit durationChanged(duration); } } -void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) +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) { kDebug() << "PLAYLIST NOT INITIALISED //////"; - return; + return -1; + } + if (prod == NULL) { + kDebug() << "Cannot insert clip without producer //////"; + return -1; } Mlt::Producer parentProd(m_mltProducer->parent()); if (parentProd.get_producer() == NULL) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; - return; + return -1; } Mlt::Service service(parentProd.get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return -1; + } Mlt::Tractor tractor(service); if (info.track > tractor.count() - 1) { kDebug() << "ERROR TRYING TO INSERT CLIP ON TRACK " << info.track << ", at POS: " << info.startPos.frames(25); - return; + return -1; } mlt_service_lock(service.get_service()); Mlt::Producer trackProducer(tractor.track(info.track)); + 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; + prod = checkSlowMotionProducer(prod, element); + if (prod == NULL || !prod->is_valid()) { + mlt_service_unlock(service.get_service()); + return -1; } - Mlt::Producer *clip = prod->cut((int) info.cropStart.frames(m_fps), (int)(info.endPos - info.startPos + info.cropStart).frames(m_fps) - 1); - int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), clip, 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); + if (overwrite && (insertPos < trackDuration)) { + // Replace zone with blanks + //trackPlaylist.split_at(insertPos, true); + trackPlaylist.remove_region(insertPos, cutDuration + 1); + int clipIndex = trackPlaylist.get_clip_index_at(insertPos); + trackPlaylist.insert_blank(clipIndex, cutDuration); + } else if (push) { + trackPlaylist.split_at(insertPos, true); + int clipIndex = trackPlaylist.get_clip_index_at(insertPos); + trackPlaylist.insert_blank(clipIndex, cutDuration); + } + int newIndex = trackPlaylist.insert_at(insertPos, clip, 1); delete clip; /*if (QString(prod->get("transparency")).toInt() == 1) mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());*/ + if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(&tractor); mlt_service_unlock(service.get_service()); - - if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength(); - //tractor.multitrack()->refresh(); - //tractor.refresh(); + /*tractor.multitrack()->refresh(); + tractor.refresh();*/ + return 0; } void Render::mltCutClip(int track, GenTime position) { - m_isBlocked = true; Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return; + } Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(track)); @@ -1583,43 +1691,101 @@ void Render::mltCutClip(int track, GenTime position) m_isBlocked = false; } -void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) +bool Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) { // TODO: optimize - mltRemoveClip(info.track, info.startPos); - mltInsertClip(info, element, prod); -} - - -bool Render::mltRemoveClip(int track, GenTime position) -{ + if (prod == NULL) { + kDebug() << "Cannot update clip with null producer //////"; + return false; + } Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; - + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } Mlt::Tractor tractor(service); - mlt_service_lock(service.get_service()); - Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Producer trackProducer(tractor.track(info.track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); - int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); - - // Display playlist info - //kDebug() << "//// BEFORE -( " << position.frames(m_fps) << " )-------------------------------"; - /*for (int i = 0; i < trackPlaylist.count(); i++) { - int blankStart = trackPlaylist.clip_start(i); - int blankDuration = trackPlaylist.clip_length(i) - 1; - QString blk; - if (trackPlaylist.is_blank(i)) blk = "(blank)"; - kDebug()<<"CLIP "< filtersList; + Mlt::Service sourceService(clip->get_service()); + int ct = 0; + Mlt::Filter *filter = sourceService.filter(ct); + while (filter) { + if (filter->get_int("kdenlive_ix") != 0) { + filtersList.append(filter); + } + ct++; + filter = sourceService.filter(ct); + } + + 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); + Mlt::Service destService(destclip->get_service()); + delete destclip; + for (int i = 0; i < filtersList.count(); i++) + destService.attach(*(filtersList.at(i))); + } + mlt_service_unlock(service.get_service()); + return true; +} + + +bool Render::mltRemoveClip(int track, GenTime position) +{ + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } + + Mlt::Tractor tractor(service); + mlt_service_lock(service.get_service()); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps)); + + // Display playlist info + //kDebug() << "//// BEFORE -( " << position.frames(m_fps) << " )-------------------------------"; + /*for (int i = 0; i < trackPlaylist.count(); i++) { + int blankStart = trackPlaylist.clip_start(i); + int blankDuration = trackPlaylist.clip_length(i) - 1; + QString blk; + if (trackPlaylist.is_blank(i)) blk = "(blank)"; + kDebug()<<"CLIP "<parent()); if (parentProd.get_producer() == NULL) { kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////"; - return -1; + return 0; } Mlt::Service service(parentProd.get_service()); @@ -1658,7 +1824,11 @@ int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) Mlt::Producer trackProducer(tractor.track(track)); Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); int clipIndex = trackPlaylist.get_clip_index_at(insertPos); - if (!trackPlaylist.is_blank(clipIndex)) return -1; + if (clipIndex == trackPlaylist.count()) { + // We are after the end of the playlist + return -1; + } + if (!trackPlaylist.is_blank(clipIndex)) return 0; if (fromBlankStart) return trackPlaylist.clip_length(clipIndex); return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos; } @@ -1711,16 +1881,19 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap if (insertPos != -1) { insertPos += offset; int clipIndex = trackPlaylist.get_clip_index_at(insertPos); - if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1); - else { + if (diff > 0) { + trackPlaylist.insert_blank(clipIndex, diff - 1); + } else { if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; - if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + if (!trackPlaylist.is_blank(clipIndex)) { + kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + } int position = trackPlaylist.clip_start(clipIndex); int blankDuration = trackPlaylist.clip_length(clipIndex); diff = -diff; - if (blankDuration - diff == 0) + if (blankDuration - diff == 0) { trackPlaylist.remove(clipIndex); - else trackPlaylist.remove_region(position, diff); + } else trackPlaylist.remove_region(position, diff); } trackPlaylist.consolidate_blanks(0); } @@ -1750,14 +1923,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; @@ -1772,19 +1943,23 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap int clipIndex = trackPlaylist.get_clip_index_at(insertPos); - if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1); - else { - if (!trackPlaylist.is_blank(clipIndex)) clipIndex --; - if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + if (diff > 0) { + trackPlaylist.insert_blank(clipIndex, diff - 1); + } else { + if (!trackPlaylist.is_blank(clipIndex)) { + clipIndex --; + } + if (!trackPlaylist.is_blank(clipIndex)) { + kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos; + } int position = trackPlaylist.clip_start(clipIndex); int blankDuration = trackPlaylist.clip_length(clipIndex); - if (diff + blankDuration == 0) + if (diff + blankDuration == 0) { trackPlaylist.remove(clipIndex); - else trackPlaylist.remove_region(position, - diff); + } else trackPlaylist.remove_region(position, - diff); } trackPlaylist.consolidate_blanks(0); } - trackNb--; } // now move transitions mlt_service serv = m_mltProducer->parent().get_service(); @@ -1813,13 +1988,14 @@ void Render::mltInsertSpace(QMap trackClipStartList, QMap } } mlt_service_unlock(service.get_service()); - mltCheckLength(); + mltCheckLength(&tractor); m_mltConsumer->set("refresh", 1); } void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) { + if (source == dest) return; Mlt::Service sourceService(source->get_service()); Mlt::Service destService(dest->get_service()); @@ -1827,7 +2003,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++; @@ -1835,12 +2011,15 @@ void Render::mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest) } } -int Render::mltChangeClipSpeed(ItemInfo info, 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; Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return -1; + } //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1; Mlt::Tractor tractor(service); Mlt::Producer trackProducer(tractor.track(info.track)); @@ -1849,24 +2028,25 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int int clipIndex = trackPlaylist.get_clip_index_at(startPos); int clipLength = trackPlaylist.clip_length(clipIndex); - Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex); - if (clip == NULL) { + Mlt::Producer *original = trackPlaylist.get_clip(clipIndex); + if (original == NULL) { return -1; } - if (!clip->is_valid() || clip->is_blank()) { + if (!original->is_valid() || original->is_blank()) { // invalid clip - delete clip; + delete original; return -1; } - Mlt::Producer clipparent = clip->parent(); + Mlt::Producer clipparent = original->parent(); if (!clipparent.is_valid() || clipparent.is_blank()) { // invalid clip - delete clip; + delete original; return -1; } 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()); @@ -1875,19 +2055,27 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int 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); + 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); + double fps = original->parent().get_double("force_fps"); + if (fps != 0.0) slowprod->set("force_fps", fps); + int threads = original->parent().get_int("threads"); + if (threads != 0) slowprod->set("threads", threads); + if (original->parent().get("force_progressive")) + slowprod->set("force_progressive", original->parent().get_int("force_progressive")); + int ix = original->parent().get_int("video_index"); + if (ix != 0) slowprod->set("video_index", ix); m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); + // Check that the blank space is long enough for our new duration clipIndex = trackPlaylist.get_clip_index_at(startPos); int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); @@ -1916,12 +2104,11 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); Mlt::Producer *cut; - GenTime oldDuration = GenTime(clipLength, m_fps); - GenTime newDuration = oldDuration * oldspeed; - if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { + int originalStart = (int)(speedIndependantInfo.cropStart.frames(m_fps)); + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + speedIndependantInfo.cropDuration).frames(m_fps) > blankEnd) { GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; - cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1)); - } else cut = prod->cut((int)(info.cropStart.frames(m_fps)), (int)((info.cropStart + newDuration).frames(m_fps)) - 1); + cut = prod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1)); + } else cut = prod->cut(originalStart, (int)(originalStart + speedIndependantInfo.cropDuration.frames(m_fps)) - 1); // move all effects to the correct producer mltPasteEffects(clip, cut); @@ -1941,32 +2128,39 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int 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); - 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); + double fps = original->parent().get_double("force_fps"); + if (fps != 0.0) slowprod->set("force_fps", fps); + if (original->parent().get("force_progressive")) + slowprod->set("force_progressive", original->parent().get_int("force_progressive")); + int threads = original->parent().get_int("threads"); + if (threads != 0) slowprod->set("threads", threads); + int ix = original->parent().get_int("video_index"); + if (ix != 0) slowprod->set("video_index", ix); m_slowmotionProducers.insert(url, slowprod); } Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex); trackPlaylist.consolidate_blanks(0); - GenTime oldDuration = GenTime(clipLength, m_fps); - GenTime newDuration = oldDuration * (oldspeed / speed); + GenTime duration = speedIndependantInfo.cropDuration / speed; + int originalStart = (int)(speedIndependantInfo.cropStart.frames(m_fps) / speed); // Check that the blank space is long enough for our new duration clipIndex = trackPlaylist.get_clip_index_at(startPos); int blankEnd = trackPlaylist.clip_start(clipIndex) + trackPlaylist.clip_length(clipIndex); Mlt::Producer *cut; - if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) { + if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + duration).frames(m_fps) > blankEnd) { GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos; - cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1)); - } else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart / speed + newDuration).frames(m_fps) - 1)); + cut = slowprod->cut(originalStart, (int)(originalStart + maxLength.frames(m_fps) - 1)); + } else cut = slowprod->cut(originalStart, (int)(originalStart + duration.frames(m_fps)) - 1); // move all effects to the correct producer mltPasteEffects(clip, cut); @@ -1979,48 +2173,101 @@ int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int mlt_service_unlock(service.get_service()); } - - delete clip; - if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(); + delete original; + if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor); m_isBlocked = false; 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) { @@ -2031,42 +2278,88 @@ 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(); + 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; - // temporarily remove all effects after insert point - QList filtersList; + 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 = 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 = service.filter(ct); + while (filter) { + if (filter->get_int("kdenlive_ix") >= filter_ix) { + if (updateIndex) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") + 1); + } + ct++; + filter = service.filter(ct); + } + m_isBlocked = false; + mlt_service_unlock(service.get_service()); + if (doRefresh) refresh(); + return true; + } + + + // temporarily remove all effects after insert point + QList filtersList; + ct = 0; + filter = service.filter(ct); + while (filter) { + 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; - int duration = clip->get_playtime(); //double max = params.paramValue("max").toDouble(); double min = params.paramValue("min").toDouble(); double factor = params.paramValue("factor", "1").toDouble(); @@ -2077,53 +2370,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") { @@ -2132,65 +2445,136 @@ 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()); } //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; // re-add following filters for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); + Mlt::Filter *filter = filtersList.at(i); + if (updateIndex) + 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; + /* kDebug() << "EDITING FILTER: "<get("kdenlive_id") <<", IX: "<get("kdenlive_ix"); + ct++; + filter = clipService.filter(ct); + } + kDebug() << "++++++++++++++++++++++++++"; + ct = 0; + 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++; @@ -2198,59 +2582,90 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par } if (!filter) { - kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!"; + 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... - int ct = 0; - filter = clipService.filter(ct); - QList filtersList; - while (filter) { - if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) { - filtersList.append(filter); - clipService.detach(*filter); - } else ct++; - filter = clipService.filter(ct); - } - bool success = mltAddEffect(track, position, params); - - for (int i = 0; i < filtersList.count(); i++) { - clipService.attach(*(filtersList.at(i))); - } + bool success = mltAddEffect(track, position, 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++) { - 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::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) +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((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 = filter->get_int("kdenlive_ix"); + if (pos == oldPos) { + filter->set("kdenlive_ix", newPos); + } else ct++; + filter = clipService.filter(ct); + } + m_isBlocked = false; + if (doRefresh) refresh(); +} + +void Render::mltMoveEffect(int track, GenTime position, int oldPos, int 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; @@ -2258,19 +2673,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++; @@ -2278,7 +2693,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); @@ -2289,7 +2704,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); @@ -2303,6 +2718,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(); } @@ -2334,18 +2813,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); @@ -2359,7 +2846,9 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) if (trackPlaylist.is_blank(clipIndex)) { int blankStart = trackPlaylist.clip_start(clipIndex); int blankDuration = trackPlaylist.clip_length(clipIndex); - if (diff > blankDuration) kDebug() << "// ERROR blank clip is not large enough to get back required space!!!"; + if (diff > blankDuration) { + kDebug() << "// ERROR blank clip is not large enough to get back required space!!!"; + } if (diff - blankDuration == 0) { trackPlaylist.remove(clipIndex); } else trackPlaylist.remove_region(blankStart, diff); @@ -2367,11 +2856,11 @@ bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex; } } - } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); + } else if (clipIndex != trackPlaylist.count()) trackPlaylist.insert_blank(clipIndex, 0 - diff - 1); trackPlaylist.consolidate_blanks(0); mlt_service_unlock(service.get_service()); - if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(); + if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength(&tractor); /*if (QString(clip->parent().get("transparency")).toInt() == 1) { //mltResizeTransparency(previousStart, previousStart, previousStart + newDuration, track, QString(clip->parent().get("id")).toInt()); mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt()); @@ -2426,10 +2915,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); @@ -2451,23 +2940,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"; } @@ -2491,54 +2996,66 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) return true; } -bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod) +bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod, bool overwrite, bool insert) { - return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod); + return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), prod, overwrite, insert); } -void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) +bool Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) { if (prod == NULL || !prod->is_valid()) { kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!"; - return; + return false; } kDebug() << "NEW PROD ID: " << prod->get("id"); m_isBlocked++; kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track; - mlt_service_lock(m_mltConsumer->get_service()); Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; - + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } + mlt_service_lock(service.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(pos + 1); + int clipIndex = trackPlaylist.get_clip_index_at(pos); Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (clipProducer->is_blank()) { + 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; + return false; } Mlt::Producer *clip = prod->cut(clipProducer->get_in(), clipProducer->get_out()); - + 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 Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool /*insert*/) { m_isBlocked++; Mlt::Service service(m_mltProducer->parent().get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return false; + } Mlt::Tractor tractor(service); mlt_service_lock(service.get_service()); @@ -2549,10 +3066,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 (!trackPlaylist.is_blank_at(moveEnd) || 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); - 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()); @@ -2560,7 +3079,13 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn return false; } else { trackPlaylist.consolidate_blanks(0); + if (overwrite) { + trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime()); + int clipIndex = trackPlaylist.get_clip_index_at(moveEnd); + trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1); + } int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + trackPlaylist.consolidate_blanks(1); delete clipProducer; /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt()); @@ -2571,17 +3096,17 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } else { Mlt::Producer destTrackProducer(tractor.track(endTrack)); Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service()); - if (!destTrackPlaylist.is_blank_at(moveEnd)) { + if (!overwrite && !destTrackPlaylist.is_blank_at(moveEnd)) { // error, destination is not empty mlt_service_unlock(service.get_service()); m_isBlocked--; return false; } else { Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex); - if (clipProducer->is_blank()) { + if (!clipProducer || clipProducer->is_blank()) { // error, destination is not empty //int ix = trackPlaylist.get_clip_index_at(moveEnd); - delete clipProducer; + if (clipProducer) delete clipProducer; kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd; mlt_service_unlock(service.get_service()); m_isBlocked--; @@ -2608,7 +3133,14 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn // move all effects to the correct producer mltPasteEffects(clipProducer, clip); + if (overwrite) { + destTrackPlaylist.remove_region(moveEnd, clip->get_playtime()); + int clipIndex = destTrackPlaylist.get_clip_index_at(moveEnd); + destTrackPlaylist.insert_blank(clipIndex, clip->get_playtime() - 1); + } + int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1); + if (clip == clipProducer) { delete clip; clip = NULL; @@ -2626,47 +3158,88 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn } } mlt_service_unlock(service.get_service()); - if (checkLength) mltCheckLength(); + if (checkLength) mltCheckLength(&tractor); m_isBlocked--; //askForRefresh(); //m_mltConsumer->set("refresh", 1); return true; } + +QList Render::checkTrackSequence(int track) +{ + QList list; + Mlt::Service service(m_mltProducer->parent().get_service()); + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return list; + } + Mlt::Tractor tractor(service); + mlt_service_lock(service.get_service()); + Mlt::Producer trackProducer(tractor.track(track)); + Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service()); + int clipNb = trackPlaylist.count(); + //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb; + for (int i = 0; i < clipNb; i++) { + Mlt::Producer *c = trackPlaylist.get_clip(i); + int pos = trackPlaylist.clip_start(i); + if (!list.contains(pos)) list.append(pos); + pos += c->get_playtime(); + if (!list.contains(pos)) list.append(pos); + delete c; + } + return list; +} + bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) { 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 serv = m_mltProducer->parent().get_service(); - m_isBlocked++; - mlt_service_lock(serv); - //m_mltConsumer->set("refresh", 0); + 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; + } - mlt_service nextservice = mlt_service_get_producer(serv); + m_isBlocked++; + mlt_service_lock(service.get_service()); + + mlt_service nextservice = mlt_service_get_producer(service.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"); - 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") { - mlt_transition tr = (mlt_transition) nextservice; - int currentTrack = mlt_transition_get_b_track(tr); - int currentIn = (int) mlt_transition_get_in(tr); - int currentOut = (int) mlt_transition_get_out(tr); + Mlt::Transition transition((mlt_transition) nextservice); + int currentTrack = transition.get_b_track(); + int currentIn = (int) transition.get_in(); + int currentOut = (int) transition.get_out(); if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) { - mlt_transition_set_in_and_out(tr, new_in, new_out); + found = true; if (newTrack - startTrack != 0) { - //kDebug() << "///// TRANSITION CHANGE TRACK. CUrrent (b): " << currentTrack << 'x' << mlt_transition_get_a_track(tr) << ", NEw: " << newTrack << 'x' << newTransitionTrack; - - mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr); - mlt_properties_set_int(properties, "a_track", newTransitionTrack); - mlt_properties_set_int(properties, "b_track", newTrack); - //kDebug() << "set new start & end :" << new_in << new_out<< "TR OFFSET: "<disconnect_service(transition); + mltPlantTransition(field, new_transition, newTransitionTrack, newTrack); + //field->plant_transition(new_transition, newTransitionTrack, newTrack); + } else transition.set_in_and_out(new_in, new_out); break; } nextservice = mlt_service_producer(nextservice); @@ -2675,22 +3248,61 @@ bool Render::mltMoveTransition(QString type, int startTrack, int newTrack, int n mlt_type = mlt_properties_get(properties, "mlt_type"); resource = mlt_properties_get(properties, "mlt_service"); } - mlt_service_unlock(serv); + mlt_service_unlock(service.get_service()); m_isBlocked--; - refresh(); + if (doRefresh) refresh(); //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1); - return true; + 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) @@ -2720,23 +3332,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()); - // 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; + mlt_properties_set_int(transproperties, "automatic", xml.attribute("automatic", "0").toInt()); + 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; } @@ -2980,10 +3603,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); @@ -2993,16 +3617,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; } @@ -3019,7 +3640,7 @@ void Render::mltSavePlaylist() fileConsumer.start(); } -QList Render::producersList() +const QList Render::producersList() { QList prods; if (m_mltProducer == NULL) return prods; @@ -3093,7 +3714,10 @@ void Render::mltInsertTrack(int ix, bool videoTrack) Mlt::Service service(m_mltProducer->parent().get_service()); mlt_service_lock(service.get_service()); - if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM"; + if (service.type() != tractor_type) { + kWarning() << "// TRACTOR PROBLEM"; + return; + } Mlt::Tractor tractor(service); @@ -3190,7 +3814,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)); @@ -3202,7 +3832,17 @@ void Render::mltDeleteTrack(int ix) tractor.removeChild(track); //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString(); setSceneList(doc.toString(), m_framePosition); - mltCheckLength(); + + /* if (m_mltProducer != NULL) { + Mlt::Producer parentProd(m_mltProducer->parent()); + if (parentProd.get_producer() != NULL) { + Mlt::Service service(parentProd.get_service()); + if (service.type() == tractor_type) { + Mlt::Tractor tractor(service); + mltCheckLength(&tractor); + } + } + }*/ } @@ -3226,5 +3866,111 @@ void Render::updatePreviewSettings() setSceneList(scene, pos); } + +QString Render::updateSceneListFps(double current_fps, double new_fps, QString scene) +{ + // Update all frame positions to the new fps value + //WARNING: there are probably some effects or other that hold a frame value + // as parameter and will also need to be updated here! + QDomDocument doc; + doc.setContent(scene); + + double factor = new_fps / current_fps; + QDomNodeList producers = doc.elementsByTagName("producer"); + for (int i = 0; i < producers.count(); i++) { + QDomElement prod = producers.at(i).toElement(); + prod.removeAttribute("in"); + prod.removeAttribute("out"); + + QDomNodeList props = prod.childNodes(); + for (int j = 0; j < props.count(); j++) { + QDomElement param = props.at(j).toElement(); + QString paramName = param.attribute("name"); + if (paramName.startsWith("meta.") || paramName == "length") { + prod.removeChild(props.at(j)); + j--; + } + } + } + + QDomNodeList entries = doc.elementsByTagName("entry"); + for (int i = 0; i < entries.count(); i++) { + QDomElement entry = entries.at(i).toElement(); + int in = entry.attribute("in").toInt(); + int out = entry.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + entry.setAttribute("in", in); + entry.setAttribute("out", out); + } + + QDomNodeList blanks = doc.elementsByTagName("blank"); + for (int i = 0; i < blanks.count(); i++) { + QDomElement blank = blanks.at(i).toElement(); + int length = blank.attribute("length").toInt(); + length = factor * length + 0.5; + blank.setAttribute("length", QString::number(length)); + } + + QDomNodeList filters = doc.elementsByTagName("filter"); + for (int i = 0; i < filters.count(); i++) { + QDomElement filter = filters.at(i).toElement(); + int in = filter.attribute("in").toInt(); + int out = filter.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + filter.setAttribute("in", in); + filter.setAttribute("out", out); + } + + QDomNodeList transitions = doc.elementsByTagName("transition"); + for (int i = 0; i < transitions.count(); i++) { + QDomElement transition = transitions.at(i).toElement(); + int in = transition.attribute("in").toInt(); + int out = transition.attribute("out").toInt(); + in = factor * in + 0.5; + out = factor * out + 0.5; + transition.setAttribute("in", in); + transition.setAttribute("out", out); + QDomNodeList props = transition.childNodes(); + for (int j = 0; j < props.count(); j++) { + QDomElement param = props.at(j).toElement(); + QString paramName = param.attribute("name"); + if (paramName == "geometry") { + QString geom = param.firstChild().nodeValue(); + QStringList keys = geom.split(';'); + QStringList newKeys; + for (int k = 0; k < keys.size(); ++k) { + if (keys.at(k).contains('=')) { + int pos = keys.at(k).section('=', 0, 0).toInt(); + pos = factor * pos + 0.5; + newKeys.append(QString::number(pos) + '=' + keys.at(k).section('=', 1)); + } else newKeys.append(keys.at(k)); + } + param.firstChild().setNodeValue(newKeys.join(";")); + } + } + } + QDomElement tractor = doc.elementsByTagName("tractor").at(0).toElement(); + int out = tractor.attribute("out").toInt(); + out = factor * out + 0.5; + tractor.setAttribute("out", out); + emit durationChanged(out); + + //kDebug() << "///////////////////////////// " << out << " \n" << doc.toString() << "\n-------------------------"; + return doc.toString(); +} + + +void Render::sendFrameUpdate() +{ + if (m_mltProducer) { + Mlt::Frame * frame = m_mltProducer->get_frame(); + emitFrameUpdated(*frame); + delete frame; + } +} + + #include "renderer.moc"