* *
***************************************************************************/
-// ffmpeg Header files
-extern "C" {
-#include <avformat.h>
-}
-
-#include <stdlib.h>
+#include "renderer.h"
+#include "kdenlivesettings.h"
+#include "kthumb.h"
+#include "definitions.h"
+#include "slideshowclip.h"
-#include <QTimer>
-#include <QDir>
-#include <QApplication>
+#include <mlt++/Mlt.h>
#include <KDebug>
#include <KStandardDirs>
#include <KLocale>
#include <KTemporaryFile>
-#include "renderer.h"
-#include "kdenlivesettings.h"
-#include "kthumb.h"
-#include "definitions.h"
+#include <QTimer>
+#include <QDir>
+#include <QString>
+#include <QApplication>
+
+#include <cstdlib>
+#include <cstdarg>
-#include <mlt++/Mlt.h>
-#if LIBAVCODEC_VERSION_MAJOR > 51 || (LIBAVCODEC_VERSION_MAJOR > 50 && LIBAVCODEC_VERSION_MINOR > 54)
-// long_name was added in FFmpeg avcodec version 51.55
-#define ENABLE_FFMPEG_CODEC_DESCRIPTION 1
-#endif
+static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
+{
+ if (level > MLT_LOG_ERROR) return;
+ QString error;
+ QApplication::postEvent(qApp->activeWindow() , new MltErrorEvent(error.vsprintf(fmt, vl).simplified()));
+ va_end(vl);
+}
-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 ?
+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);
+#ifdef Q_WS_MAC
+ self->showFrame(frame);
+#endif
+
+ self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
+ if (self->sendFrameForAnalysis && frame_ptr->convert_image) {
+ self->emitFrameUpdated(frame);
+ }
+ if (frame.get_double("_speed") == 0.0) {
+ self->emitConsumerStopped();
+ } else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
+ 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_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(winid), m_externalwinid(extid), m_framePosition(0), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false), m_isZoneMode(false), m_isLoopMode(false) {
- kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
- refreshTimer = new QTimer(this);
- connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
+Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) :
+ QObject(parent),
+ m_isBlocked(0),
+ sendFrameForAnalysis(false),
+ m_name(rendererName),
+ m_mltConsumer(NULL),
+ m_mltProducer(NULL),
+ m_mltProfile(NULL),
+ m_framePosition(0),
+ m_isZoneMode(false),
+ m_isLoopMode(false),
+ m_isSplitView(false),
+ m_blackClip(NULL),
+ m_winid(winid)
+#ifdef Q_WS_MAC
+ , m_glWidget(0)
+#endif
+{
/*if (rendererName == "project") m_monitorId = 10000;
else m_monitorId = 10001;*/
- osdTimer = new QTimer(this);
- connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
+ /*m_osdTimer = new QTimer(this);
+ connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/
+ if (profile.isEmpty()) profile = KdenliveSettings::current_profile();
+ buildConsumer(profile);
- m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
- buildConsumer();
-
- Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black");
- m_mltProducer = producer;
- if (m_blackClip) delete m_blackClip;
- m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
- m_blackClip->set("id", "black");
+ m_mltProducer = m_blackClip->cut(0, 50);
m_mltConsumer->connect(*m_mltProducer);
m_mltProducer->set_speed(0.0);
}
-Render::~Render() {
+Render::~Render()
+{
+ m_isBlocked = 1;
closeMlt();
}
-void Render::closeMlt() {
- delete osdTimer;
- delete refreshTimer;
- if (m_mltConsumer)
- delete m_mltConsumer;
- if (m_mltProducer)
- delete m_mltProducer;
- if (m_blackClip) delete m_blackClip;
+void Render::closeMlt()
+{
+ //delete m_osdTimer;
+ if (m_mltProducer) {
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
+
+ if (service.type() == tractor_type) {
+ Mlt::Tractor tractor(service);
+ 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");
+ }
+
+ for (int trackNb = tractor.count() - 1; trackNb >= 0; --trackNb) {
+ Mlt::Producer trackProducer(tractor.track(trackNb));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
+ }
+ }
+ mlt_service_unlock(service.get_service());
+ }
+
+ kDebug() << "// // // CLOSE RENDERER " << m_name;
+ delete m_mltConsumer;
+ delete m_mltProducer;
+ delete m_blackClip;
//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;
- tmp = decodedString(KdenliveSettings::current_profile());
+ m_activeProfile = profileName;
+ tmp = decodedString(m_activeProfile);
+ 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;
-
QString videoDriver = KdenliveSettings::videodrivername();
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
}
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
+ //m_mltConsumer->set("fullscreen", 1);
+#ifdef Q_WS_MAC
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio");
+ m_mltConsumer->set("preview_off", 1);
+ m_mltConsumer->set("preview_format", mlt_image_rgb24a);
+#else
m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
+#endif
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
- //m_mltConsumer->set("fullscreen", 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("rescale", "nearest");
+ mlt_log_set_callback(kdenlive_callback);
QString audioDevice = KdenliveSettings::audiodevicename();
if (!audioDevice.isEmpty()) {
}
QString audioDriver = KdenliveSettings::audiodrivername();
+
+ /*
+ // Disabled because the "auto" detected driver was sometimes wrong
+ if (audioDriver.isEmpty())
+ audioDriver = KdenliveSettings::autoaudiodrivername();
+ */
+
if (!audioDriver.isEmpty()) {
tmp = decodedString(audioDriver);
m_mltConsumer->set("audio_driver", tmp);
delete[] tmp;
}
+ 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->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");
+ char *tmp = decodedString(id);
+ clip->set("id", tmp);
+ delete[] tmp;
+ clip->set("mlt_type", "producer");
+ return clip;
}
-int Render::resetProfile() {
- if (!m_mltConsumer) return 0;
- QString currentProfile = getenv("MLT_PROFILE");
- if (currentProfile == KdenliveSettings::current_profile()) {
- kDebug() << "reset to same profile, nothing to do";
- return 1;
+int Render::resetProfile(const QString profileName)
+{
+ if (m_mltConsumer) {
+ QString videoDriver = KdenliveSettings::videodrivername();
+ QString currentDriver = m_mltConsumer->get("video_driver");
+ if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
+ 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;
}
- 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();
- if (m_mltProducer) delete m_mltProducer;
+ 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);
+ 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();
+ }
+ }
+
+ delete m_mltProducer;
+ }
m_mltProducer = 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);
-
- char *tmp = decodedString(scene);
- Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
+ setSceneList(scene, pos);
+ // producers have changed (different profile), so reset them...
+ emit refreshDocumentProducers();
+ /*char *tmp = decodedString(scene);
+ Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "xml-string", tmp);
delete[] tmp;
m_mltProducer = producer;
- if (m_blackClip) delete m_blackClip;
m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
m_mltProducer->optimise();
m_mltProducer->set_speed(0);
- connectPlaylist();
+ connectPlaylist();*/
//delete m_mltProfile;
// mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer());
return 1;
}
-/** Wraps the VEML command of the same name; Seeks the renderer clip to the given time. */
-void Render::seek(GenTime time) {
+void Render::seek(GenTime time)
+{
if (!m_mltProducer)
return;
m_isBlocked = false;
}
//static
-char *Render::decodedString(QString str) {
+char *Render::decodedString(QString str)
+{
/*QCString fn = QFile::encodeName(str);
char *t = new char[fn.length() + 1];
strcpy(t, (const char *)fn);*/
return pix;
}
*/
-const int Render::renderWidth() const {
- return (int)(m_mltProfile->height() * m_mltProfile->dar());
+int Render::renderWidth() const
+{
+ return (int)(m_mltProfile->height() * m_mltProfile->dar() + 0.5);
}
-const int Render::renderHeight() const {
+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();
- }
- QPixmap pix(width, height);
+ } else if (width % 2 == 1) width++;
+
if (!m_mltProducer) {
+ QImage pix(width, height, QImage::Format_RGB32);
pix.fill(Qt::black);
return pix;
}
return KThumb::getFrame(m_mltProducer, frame_position, width, height);
}
-QPixmap Render::getImageThumbnail(KUrl url, int width, int height) {
+QPixmap Render::getImageThumbnail(KUrl url, int /*width*/, int /*height*/)
+{
QImage im;
QPixmap pixmap;
if (url.fileName().startsWith(".all.")) { // check for slideshow
filter << "*." + fileType;
filter << "*." + fileType.toUpper();
more = dir.entryList(filter, QDir::Files);
- im.load(url.directory() + "/" + more.at(0));
+ im.load(url.directory() + '/' + more.at(0));
} else im.load(url.path());
//pixmap = im.scaled(width, height);
return pixmap;
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: "<<url.directory() + "/" + *it;
+ if (!im.load(url.directory() + '/' + *it))
+ kDebug()<<"++ ERROR LOADIN IMAGE: "<<url.directory() + '/' + *it;
break;
}
}
}*/
-double Render::consumerRatio() const {
+double Render::consumerRatio() const
+{
if (!m_mltConsumer) return 1.0;
return (m_mltConsumer->get_double("aspect_ratio_num") / m_mltConsumer->get_double("aspect_ratio_den"));
}
-int Render::getLength() {
+int Render::getLength()
+{
if (m_mltProducer) {
// kDebug()<<"////// LENGTH: "<<mlt_producer_get_playtime(m_mltProducer->get_producer());
return 0;
}
-bool Render::isValid(KUrl url) {
+bool Render::isValid(KUrl url)
+{
char *tmp = decodedString(url.path());
Mlt::Producer producer(*m_mltProfile, tmp);
delete[] tmp;
return true;
}
-const double Render::dar() const {
+double Render::dar() const
+{
return m_mltProfile->dar();
}
-void Render::slotSplitView(bool doit) {
+void Render::slotSplitView(bool doit)
+{
m_isSplitView = doit;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
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) {
tmp = "0,50%:50%x50%";
break;
case 3:
+ default:
tmp = "50%,50%:50%x50%";
break;
}
}
}
-void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
- int height = 50;
- int width = (int)(height * m_mltProfile->dar());
- QMap < QString, QString > filePropertyMap;
- QMap < QString, QString > metadataPropertyMap;
-
- KUrl url = KUrl(xml.attribute("resource", QString::null));
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer)
+{
+ KUrl url = KUrl(xml.attribute("resource", QString()));
Mlt::Producer *producer = NULL;
- if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+ //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, "fezzik", tmp);
+ producer = new Mlt::Producer(*m_mltProfile, 0, tmp);
delete[] tmp;
+ } 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 (producer && xml.hasAttribute("xmldata")) {
+ tmp = decodedString(xml.attribute("xmldata"));
+ producer->set("xmldata", tmp);
+ delete[] tmp;
+ }
} else if (url.isEmpty()) {
QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
+ QDomElement mlt = doc.createElement("mlt");
QDomElement play = doc.createElement("playlist");
- doc.appendChild(westley);
- westley.appendChild(play);
+ doc.appendChild(mlt);
+ mlt.appendChild(play);
play.appendChild(doc.importNode(xml, true));
char *tmp = decodedString(doc.toString());
- producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+ producer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
delete[] tmp;
} else {
- QString urlpath = url.path();
- /*if (urlpath.contains(':')) {
- if (!urlpath.startsWith("file:")) urlpath.prepend("file:");
- char *tmp = decodedString(urlpath);
- producer = new Mlt::Producer(*m_mltProfile, "avformat", tmp);
- delete[] tmp;
- }
- else {*/
- char *tmp = decodedString(urlpath);
+ char *tmp = decodedString(url.path());
producer = new Mlt::Producer(*m_mltProfile, tmp);
delete[] tmp;
-
- if (xml.hasAttribute("force_aspect_ratio")) {
- double aspect = xml.attribute("force_aspect_ratio").toDouble();
- if (aspect > 0) producer->set("force_aspect_ratio", aspect);
- }
- if (xml.hasAttribute("threads")) {
- int threads = xml.attribute("threads").toInt();
- if (threads != 1) producer->set("threads", threads);
- }
- if (xml.hasAttribute("video_index")) {
- int vindex = xml.attribute("video_index").toInt();
- if (vindex != 0) producer->set("video_index", vindex);
- }
- if (xml.hasAttribute("audio_index")) {
- int aindex = xml.attribute("audio_index").toInt();
- if (aindex != 0) producer->set("audio_index", aindex);
- }
- //}
}
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
- kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
- emit removeInvalidClip(clipId);
+ kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
+ emit removeInvalidClip(clipId, replaceProducer);
+ delete producer;
return;
}
+ if (xml.hasAttribute("force_aspect_ratio")) {
+ 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);
+ }
+ if (xml.hasAttribute("video_index")) {
+ int vindex = xml.attribute("video_index").toInt();
+ if (vindex != 0) producer->set("video_index", vindex);
+ }
+ if (xml.hasAttribute("audio_index")) {
+ int aindex = xml.attribute("audio_index").toInt();
+ if (aindex != 0) producer->set("audio_index", aindex);
+ }
+
+ // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken although 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);
+
if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
char *tmp = decodedString(clipId);
producer->set("id", tmp);
delete[] tmp;
+
+ if (xml.hasAttribute("templatetext")) {
+ char *tmp = decodedString(xml.attribute("templatetext"));
+ producer->set("templatetext", tmp);
+ delete[] tmp;
+ }
+
+ if (!replaceProducer && xml.hasAttribute("file_hash")) {
+ // Clip already has all properties
+ emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
+ return;
+ }
+
+ int width = (int)(imageHeight * m_mltProfile->dar() + 0.5);
+ QMap < QString, QString > filePropertyMap;
+ QMap < QString, QString > metadataPropertyMap;
+
int frameNumber = xml.attribute("thumbnail", "0").toInt();
if (frameNumber != 0) producer->seek(frameNumber);
- mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer());
filePropertyMap["duration"] = QString::number(producer->get_playtime());
//kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
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 (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 (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) {
- char *tmp = decodedString(xml.attribute("luma_file"));
- filter->set("luma.resource", tmp);
- delete[] tmp;
- if (xml.hasAttribute("softness")) {
- int soft = xml.attribute("softness").toInt();
- filter->set("luma.softness", (double) soft / 100.0);
+ if (filter && filter->is_valid()) {
+ 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;
+ if (xml.hasAttribute("softness")) {
+ int soft = xml.attribute("softness").toInt();
+ filter->set("luma.softness", (double) soft / 100.0);
+ }
}
+ 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);
}
- Mlt::Service clipService(producer->get_service());
- clipService.attach(*filter);
}
}
filePropertyMap["fps"] = producer->get("source_fps");
if (frame && frame->is_valid()) {
- filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + "x" + QString::number(frame->get_int("height"));
+ filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
filePropertyMap["frequency"] = QString::number(frame->get_int("frequency"));
filePropertyMap["channels"] = QString::number(frame->get_int("channels"));
filePropertyMap["aspect_ratio"] = frame->get("aspect_ratio");
if (frame->get_int("test_image") == 0) {
- if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
+ if (url.path().endsWith(".mlt") || url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
filePropertyMap["type"] = "playlist";
- metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer->get_service()), "title"));
+ metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
} else if (frame->get_int("test_audio") == 0)
filePropertyMap["type"] = "av";
else
filePropertyMap["type"] = "video";
- mlt_image_format format = mlt_image_yuv422;
- int frame_width = 0;
- int frame_height = 0;
- //frame->set("rescale.interp", "hyper");
- frame->set("normalised_height", height);
- frame->set("normalised_width", width);
- QPixmap pix(width, height);
-
+ mlt_image_format format = mlt_image_rgb24a;
+ int frame_width = width;
+ int frame_height = imageHeight;
uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
- uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4);
- mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height);
- QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
+ QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
+ 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);
- mlt_pool_release(new_image);
- emit replyGetImage(clipId, 0, pix, width, height);
+ emit replyGetImage(clipId, pix);
} else if (frame->get_int("test_audio") == 0) {
- QPixmap pixmap = KIcon("audio-x-generic").pixmap(QSize(width, height));
- emit replyGetImage(clipId, 0, pixmap, 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
- // Fetch the video_context
-#if 1
-
- AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data(properties, "video_context", NULL);
- if (context != NULL) {
+ // If there is a
+ char property[200];
+ if (producer->get_int("video_index") > -1) {
/*if (context->duration == AV_NOPTS_VALUE) {
- kDebug() << " / / / / / / / /ERRROR / / / CLIP HAS UNKNOWN DURATION";
+ kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION";
emit removeInvalidClip(clipId);
+ delete producer;
return;
}*/
// Get the video_index
- int index = mlt_properties_get_int(properties, "video_index");
- int default_video = -1;
+ int default_video = producer->get_int("video_index");
int video_max = 0;
- int default_audio = -1;
+ int default_audio = producer->get_int("audio_index");
int audio_max = 0;
- // Find default audio stream (borrowed from MLT)
- for (int ix = 0; ix < context->nb_streams; ix++) {
- // Get the codec context
- AVCodecContext *codec_context = context->streams[ ix ]->codec;
- if (avcodec_find_decoder(codec_context->codec_id) == NULL)
- continue;
- // Determine the type and obtain the first index of each type
- switch (codec_context->codec_type) {
- case CODEC_TYPE_VIDEO:
- if (default_video < 0) default_video = ix;
+ // Find maximum stream index values
+ for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) {
+ snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix);
+ QString type = producer->get(property);
+ if (type == "video")
video_max = ix;
- break;
- case CODEC_TYPE_AUDIO:
- if (default_audio < 0) default_audio = ix;
+ else if (type == "audio")
audio_max = ix;
- break;
- default:
- break;
- }
}
filePropertyMap["default_video"] = QString::number(default_video);
filePropertyMap["video_max"] = QString::number(video_max);
filePropertyMap["default_audio"] = QString::number(default_audio);
filePropertyMap["audio_max"] = QString::number(audio_max);
+ snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video);
+ if (producer->get(property)) {
+ filePropertyMap["videocodec"] = producer->get(property);
+ } else {
+ snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
+ if (producer->get(property))
+ filePropertyMap["videocodec"] = producer->get(property);
+ }
-#if ENABLE_FFMPEG_CODEC_DESCRIPTION
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) {
- filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->long_name;
- } else
-#endif
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) {
- filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
+ if (KdenliveSettings::dropbframes()) {
+ kDebug() << "// LOOKING FOR H264 on: " << default_video;
+ snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
+ kDebug() << "PROP: " << property << " = " << producer->get(property);
+ if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) {
+ kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
+ producer->set("skip_loop_filter", "all");
+ producer->set("skip_frame", "bidir");
}
+ }
+
} else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
- context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL);
- if (context != NULL) {
+ if (producer->get_int("audio_index") > -1) {
// Get the audio_index
- int index = mlt_properties_get_int(properties, "audio_index");
+ int index = producer->get_int("audio_index");
-#if ENABLE_FFMPEG_CODEC_DESCRIPTION
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name)
- filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->long_name;
- else
-#endif
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
- filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
+ snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", index);
+ if (producer->get(property)) {
+ filePropertyMap["audiocodec"] = producer->get(property);
+ } else {
+ snprintf(property, sizeof(property), "meta.media.%d.codec.name", index);
+ if (producer->get(property))
+ filePropertyMap["audiocodec"] = producer->get(property);
+ }
}
-#endif
- // metadata
- mlt_properties metadata = mlt_properties_new();
- mlt_properties_pass(metadata, properties, "meta.attr.");
- int count = mlt_properties_count(metadata);
+ // metadata
+ Mlt::Properties metadata;
+ metadata.pass_values(*producer, "meta.attr.");
+ int count = metadata.count();
for (int i = 0; i < count; i ++) {
- QString name = mlt_properties_get_name(metadata, i);
- QString value = QString::fromUtf8(mlt_properties_get_value(metadata, i));
+ QString name = metadata.get_name(i);
+ QString value = QString::fromUtf8(metadata.get(i));
if (name.endsWith("markup") && !value.isEmpty())
- metadataPropertyMap[ name.section(".", 0, -2)] = value;
+ metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
-
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+ producer->seek(0);
kDebug() << "REquested fuile info for: " << url.path();
- if (frame) delete frame;
- //if (producer) delete producer;
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
+ // FIXME: should delete this to avoid a leak...
+ //delete producer;
}
-/** Create the producer from the Westley QDomDocument */
#if 0
-void Render::initSceneList() {
+/** Create the producer from the MLT XML QDomDocument */
+void Render::initSceneList()
+{
kDebug() << "-------- INIT SCENE LIST ------_";
QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
- doc.appendChild(westley);
+ QDomElement mlt = doc.createElement("mlt");
+ doc.appendChild(mlt);
QDomElement prod = doc.createElement("producer");
prod.setAttribute("resource", "colour");
prod.setAttribute("colour", "red");
QDomElement playlist5 = doc.createElement("playlist");
multitrack.appendChild(playlist5);
tractor.appendChild(multitrack);
- westley.appendChild(tractor);
+ mlt.appendChild(tractor);
// kDebug()<<doc.toString();
/*
- QString tmp = QString("<westley><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></westley>");*/
+ QString tmp = QString("<mlt><producer resource=\"colour\" colour=\"red\" id=\"red\" /><tractor><multitrack><playlist></playlist><playlist></playlist><playlist /><playlist /><playlist></playlist></multitrack></tractor></mlt>");*/
setSceneList(doc, 0);
}
#endif
-
-
-/** Create the producer from the Westley QDomDocument */
-void Render::setProducer(Mlt::Producer *producer, int position) {
- if (m_winid == -1) return;
+int Render::setProducer(Mlt::Producer *producer, int position)
+{
+ if (m_winid == -1) return -1;
if (m_mltConsumer) {
m_mltConsumer->stop();
- } else return;
+ } else return -1;
+
+ m_mltConsumer->purge();
m_isBlocked = true;
if (m_mltProducer) {
m_mltProducer = NULL;
emit stopped();
}
- if (producer) m_mltProducer = new Mlt::Producer(producer->get_producer());
- else m_mltProducer = new Mlt::Producer();
- if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+ if (producer) {
+ m_mltProducer = new Mlt::Producer(producer->get_producer());
+ } else m_mltProducer = m_blackClip->cut(0, 50);
+ /*if (KdenliveSettings::dropbframes()) {
+ m_mltProducer->set("skip_loop_filter", "all");
+ m_mltProducer->set("skip_frame", "bidir");
+ }*/
+ if (!m_mltProducer || !m_mltProducer->is_valid()) {
+ kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
+ return -1;
+ }
m_fps = m_mltProducer->get_fps();
- connectPlaylist();
+ 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 Westley QDomDocument */
-void Render::setSceneList(QDomDocument list, int position) {
- setSceneList(list.toString(), position);
+int Render::setSceneList(QDomDocument list, int position)
+{
+ return setSceneList(list.toString(), position);
}
-/** Create the producer from the Westley QDomDocument */
-void Render::setSceneList(QString playlist, int position) {
- if (m_winid == -1) return;
+int Render::setSceneList(QString playlist, int position)
+{
+ if (m_winid == -1) return -1;
m_isBlocked = true;
+ int error = 0;
- //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
+ kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
if (m_mltConsumer) {
- m_mltConsumer->stop();
- //m_mltConsumer->set("refresh", 0);
+ if (!m_mltConsumer->is_stopped()) {
+ m_mltConsumer->stop();
+ }
+ m_mltConsumer->set("refresh", 0);
} else {
- m_isBlocked = false;
- return;
+ kWarning() << "/////// ERROR, TRYING TO USE NULL MLT CONSUMER";
+ error = -1;
}
if (m_mltProducer) {
m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
+
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
+
+ if (service.type() == tractor_type) {
+ Mlt::Tractor tractor(service);
+ 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());
+ 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;
emit stopped();
blockSignals(true);
char *tmp = decodedString(playlist);
- m_mltProducer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
- delete[] tmp;
- if (m_blackClip) delete m_blackClip;
- m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
- m_blackClip->set("id", "black");
+ m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", tmp);
+
if (!m_mltProducer || !m_mltProducer->is_valid()) {
kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
+ m_mltProducer = m_blackClip->cut(0, 50);
+ error = -1;
}
+ delete[] tmp;
+
m_mltProducer->optimise();
/*if (KdenliveSettings::osdtimecode()) {
delete m_osdInfo;
QString attr = "attr_check";
mlt_filter filter = mlt_factory_filter( "data_feed", (char*) attr.ascii() );
- mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_fezzik", 1 );
+ mlt_properties_set_int( MLT_FILTER_PROPERTIES( filter ), "_loader", 1 );
mlt_producer_attach( m_mltProducer->get_producer(), filter );
mlt_filter_close( filter );
}*/
m_fps = m_mltProducer->get_fps();
- kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
- connectPlaylist();
if (position != 0) {
- //TODO: seek to correct place after opening project.
- // Needs to be done from another place since it crashes here.
+ // Seek to correct place after opening project.
m_mltProducer->seek(position);
}
+
+ kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
+ if (error == 0) error = connectPlaylist();
+ else connectPlaylist();
+ fillSlowMotionProducers();
+
m_isBlocked = false;
blockSignals(false);
- emit rendererPosition(position);
+
+ return error;
+ //kDebug()<<"// SETSCN LST, POS: "<<position;
+ //if (position != 0) emit rendererPosition(position);
}
-/** Create the producer from the Westley QDomDocument */
-QString Render::sceneList() {
+const QString Render::sceneList()
+{
QString playlist;
- Mlt::Consumer westleyConsumer(*m_mltProfile , "westley:kdenlive_playlist");
+ Mlt::Consumer xmlConsumer(*m_mltProfile , "xml:kdenlive_playlist");
m_mltProducer->optimise();
- westleyConsumer.set("terminate_on_pause", 1);
+ xmlConsumer.set("terminate_on_pause", 1);
Mlt::Producer prod(m_mltProducer->get_producer());
bool split = m_isSplitView;
if (split) slotSplitView(false);
- westleyConsumer.connect(prod);
- westleyConsumer.start();
- while (!westleyConsumer.is_stopped()) {}
- playlist = QString::fromUtf8(westleyConsumer.get("kdenlive_playlist"));
+ xmlConsumer.connect(prod);
+ xmlConsumer.start();
+ while (!xmlConsumer.is_stopped()) {}
+ playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist"));
if (split) slotSplitView(true);
return playlist;
}
-void Render::saveSceneList(QString path, QDomElement kdenliveData) {
+bool Render::saveSceneList(QString path, QDomElement kdenliveData)
+{
QFile file(path);
QDomDocument doc;
doc.setContent(sceneList(), false);
if (!kdenliveData.isNull()) {
// add Kdenlive specific tags
- QDomNode wes = doc.elementsByTagName("westley").at(0);
- wes.appendChild(doc.importNode(kdenliveData, true));
+ QDomNode mlt = doc.elementsByTagName("mlt").at(0);
+ mlt.appendChild(doc.importNode(kdenliveData, true));
}
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
kWarning() << "////// ERROR writing to file: " << path;
- return;
+ return false;
+ }
+ file.write(doc.toString().toUtf8());
+ if (file.error() != QFile::NoError) {
+ file.close();
+ return false;
}
- QTextStream out(&file);
- out << doc.toString();
file.close();
+ return true;
}
-
-void Render::saveZone(KUrl url, QString desc, QPoint zone) {
+void Render::saveZone(KUrl url, QString desc, QPoint zone)
+{
kDebug() << "// SAVING CLIP ZONE, RENDER: " << m_name;
- char *tmppath = decodedString("westley:" + url.path());
- Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
+ char *tmppath = decodedString("xml:" + url.path());
+ Mlt::Consumer xmlConsumer(*m_mltProfile , tmppath);
m_mltProducer->optimise();
delete[] tmppath;
- westleyConsumer.set("terminate_on_pause", 1);
+ 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;
- westleyConsumer.connect(list);
+ xmlConsumer.connect(list);
} else {
//TODO: not working yet, save zone from timeline
tmppath = decodedString(desc);
//prod->set("title", tmppath);
delete[] tmppath;
- westleyConsumer.connect(*p1); //list);
+ xmlConsumer.connect(*p1); //list);
}
- westleyConsumer.start();
+ xmlConsumer.start();
}
-const double Render::fps() const {
+double Render::fps() const
+{
return m_fps;
}
-void Render::connectPlaylist() {
- if (!m_mltConsumer) return;
+int Render::connectPlaylist()
+{
+ if (!m_mltConsumer) return -1;
//m_mltConsumer->set("refresh", "0");
m_mltConsumer->connect(*m_mltProducer);
m_mltProducer->set_speed(0);
- m_mltConsumer->start();
+ if (m_mltConsumer->start() == -1) {
+ // ARGH CONSUMER BROKEN!!!!
+ KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
+ delete m_mltConsumer;
+ m_mltConsumer = NULL;
+ return -1;
+ }
emit durationChanged(m_mltProducer->get_playtime());
+ return 0;
//refresh();
- /*
- 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."));
- m_mltConsumer = NULL;
- }
- else {
- refresh();
- }*/
}
-void Render::refreshDisplay() {
+void Render::refreshDisplay()
+{
if (!m_mltProducer) return;
//m_mltConsumer->set("refresh", 0);
- mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
+ //mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
/*if (KdenliveSettings::osdtimecode()) {
mlt_properties_set_int( properties, "meta.attr.timecode", 1);
mlt_properties_set( properties, "meta.attr.timecode.markup", "#timecode#");
refresh();
}
-void Render::setVolume(double volume) {
+void Render::setVolume(double /*volume*/)
+{
if (!m_mltConsumer || !m_mltProducer) return;
/*osdTimer->stop();
m_mltConsumer->set("refresh", 0);
if (m_mltProducer->attach(*m_osdInfo) == 1) kDebug()<<"////// error attaching filter";
}*/
refresh();
- osdTimer->setSingleShot(2500);
+ //m_osdTimer->setSingleShot(2500);
}
-void Render::slotOsdTimeout() {
+void Render::slotOsdTimeout()
+{
mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
mlt_properties_set_int(properties, "meta.attr.osdvolume", 0);
mlt_properties_set(properties, "meta.attr.osdvolume.markup", NULL);
refresh();
}
-void Render::start() {
+void Render::start()
+{
kDebug() << "----- STARTING MONITOR: " << m_name;
if (m_winid == -1) {
kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART";
return;
}
-
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."));
- m_mltConsumer = NULL;
- return;
+ //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;
m_isBlocked = false;
}
-void Render::clear() {
- kDebug() << " ********* RENDER CLEAR";
- if (m_mltConsumer) {
- //m_mltConsumer->set("refresh", 0);
- if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
- }
-
- if (m_mltProducer) {
- //if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
- m_mltProducer->set_speed(0.0);
- delete m_mltProducer;
- m_mltProducer = NULL;
- emit stopped();
- }
-}
-
-void Render::stop() {
+void Render::stop()
+{
+ if (m_mltProducer == NULL) return;
if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
kDebug() << "///////////// RENDER STOPPED: " << m_name;
m_isBlocked = true;
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
m_mltConsumer->stop();
// delete m_mltConsumer;
// m_mltConsumer = NULL;
kDebug() << "///////////// RENDER STOP3-------";
}
-void Render::stop(const GenTime & startTime) {
+void Render::stop(const GenTime & startTime)
+{
kDebug() << "///////////// RENDER STOP-------2";
if (m_mltProducer) {
m_mltConsumer->purge();
}
-void Render::pause() {
+void Render::pause()
+{
if (!m_mltProducer || !m_mltConsumer)
return;
if (m_mltProducer->get_speed() == 0.0) return;
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();
}
-void Render::switchPlay() {
+void Render::switchPlay()
+{
if (!m_mltProducer || !m_mltConsumer)
return;
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: "<<m_mltProducer->get_speed();
//refresh();
}
-void Render::play(double speed) {
+void Render::play(double speed)
+{
if (!m_mltProducer)
return;
// if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
refresh();
}
-void Render::play(const GenTime & startTime) {
+void Render::play(const GenTime & startTime)
+{
if (!m_mltProducer || !m_mltConsumer)
return;
m_isBlocked = false;
m_mltConsumer->set("refresh", 1);
}
-void Render::loopZone(const GenTime & startTime, const GenTime & stopTime) {
+void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
+{
if (!m_mltProducer || !m_mltConsumer)
return;
//m_mltProducer->set("eof", "loop");
playZone(startTime, stopTime);
}
-void Render::playZone(const GenTime & startTime, const GenTime & stopTime) {
+void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
+{
if (!m_mltProducer || !m_mltConsumer)
return;
m_isBlocked = false;
- m_mltProducer->set("out", stopTime.frames(m_fps));
+ if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1;
+ 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);
m_isZoneMode = true;
}
-void Render::resetZoneMode() {
- m_mltProducer->set("out", m_mltProducer->get_length() - 1);
+void Render::resetZoneMode()
+{
+ if (!m_isZoneMode && !m_isLoopMode) return;
+ m_mltProducer->set("out", m_originalOut);
//m_mltProducer->set("eof", "pause");
m_isZoneMode = false;
m_isLoopMode = false;
}
-void Render::seekToFrame(int pos) {
+void Render::seekToFrame(int pos)
+{
//kDebug()<<" ********* RENDER SEEK TO POS";
if (!m_mltProducer)
return;
refresh();
}
-void Render::askForRefresh() {
- // Use a Timer so that we don't refresh too much
- refreshTimer->start(200);
+void Render::seekToFrameDiff(int diff)
+{
+ //kDebug()<<" ********* RENDER SEEK TO POS";
+ if (!m_mltProducer)
+ return;
+ m_isBlocked = false;
+ resetZoneMode();
+ m_mltProducer->seek(m_mltProducer->position() + diff);
+ refresh();
}
-void Render::doRefresh() {
+void Render::doRefresh()
+{
// Use a Timer so that we don't refresh too much
if (!m_isBlocked && m_mltConsumer) m_mltConsumer->set("refresh", 1);
}
-void Render::refresh() {
+void Render::refresh()
+{
if (!m_mltProducer || m_isBlocked)
return;
- refreshTimer->stop();
if (m_mltConsumer) {
m_mltConsumer->set("refresh", 1);
}
}
-double Render::playSpeed() {
+void Render::setDropFrames(bool show)
+{
+ if (m_mltConsumer) {
+ int dropFrames = 1;
+ if (show == false) dropFrames = 0;
+ m_mltConsumer->stop();
+#ifdef Q_WS_MAC
+ m_mltConsumer->set("real_time", dropFrames);
+#else
+ m_mltConsumer->set("play.real_time", dropFrames);
+#endif
+ if (m_mltConsumer->start() == -1) {
+ kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
+ }
+
+ }
+}
+
+double Render::playSpeed()
+{
if (m_mltProducer) return m_mltProducer->get_speed();
return 0.0;
}
-GenTime Render::seekPosition() const {
+GenTime Render::seekPosition() const
+{
if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps);
else return GenTime();
}
+int Render::seekFramePosition() const
+{
+ if (m_mltProducer) return (int) m_mltProducer->position();
+ return 0;
+}
-const QString & Render::rendererName() const {
+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) {
+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() {
+void Render::emitConsumerStopped()
+{
// This is used to know when the playing stopped
if (m_mltProducer) {
double pos = m_mltProducer->position();
}
}
-
-
-void Render::exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime) {
+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) {
+void Render::exportCurrentFrame(KUrl url, bool /*notify*/)
+{
if (!m_mltProducer) {
KMessageBox::sorry(qApp->activeWindow(), i18n("There is no clip, cannot extract frame."));
return;
}
- int height = 1080;//KdenliveSettings::defaultheight();
- int width = 1940; //KdenliveSettings::displaywidth();
+ //int height = 1080;//KdenliveSettings::defaultheight();
+ //int width = 1940; //KdenliveSettings::displaywidth();
//TODO: rewrite
QPixmap pix; // = KThumb::getFrame(m_mltProducer, -1, width, height);
/*
//if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003));
}
-/** MLT PLAYLIST DIRECT MANIPULATON **/
+#ifdef Q_WS_MAC
+void Render::showFrame(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.scanLine(0), image, width * height * 4);
+ emit showImageSignal(qimage);
+}
+#endif
-void Render::mltCheckLength(bool reload) {
- //kDebug()<<"checking track length: "<<track<<"..........";
+/*
+ * MLT playlist direct manipulation.
+ */
- Mlt::Service service(m_mltProducer->get_service());
- Mlt::Tractor tractor(service);
+void Render::mltCheckLength(Mlt::Tractor *tractor)
+{
+ //kDebug()<<"checking track length: "<<track<<"..........";
- int trackNb = tractor.count();
- double duration = 0;
- double trackDuration;
+ int trackNb = tractor->count();
+ int duration = 0;
+ int trackDuration;
if (trackNb == 1) {
- Mlt::Producer trackProducer(tractor.track(0));
- Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- duration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
+ Mlt::Producer trackProducer(tractor->track(0));
+ duration = trackProducer.get_playtime() - 1;
m_mltProducer->set("out", duration);
- emit durationChanged((int) duration);
+ emit durationChanged(duration);
return;
}
while (trackNb > 1) {
- Mlt::Producer trackProducer(tractor.track(trackNb - 1));
- Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- trackDuration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
-
- //kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration;
+ Mlt::Producer trackProducer(tractor->track(trackNb - 1));
+ trackDuration = trackProducer.get_playtime() - 1;
+ // kDebug() << " / / /DURATON FOR TRACK " << trackNb - 1 << " = " << trackDuration;
if (trackDuration > duration) duration = trackDuration;
trackNb--;
}
- Mlt::Producer blackTrackProducer(tractor.track(0));
- Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
- double blackDuration = Mlt::Producer(blackTrackPlaylist.get_producer()).get_playtime() - 1;
+ Mlt::Producer blackTrackProducer(tractor->track(0));
- if (blackDuration != duration) {
- blackTrackPlaylist.remove_region(0, (int)blackDuration);
- int i = 0;
- int dur = (int)duration;
- QDomDocument doc;
- QDomElement black = doc.createElement("producer");
- black.setAttribute("mlt_service", "colour");
- black.setAttribute("colour", "black");
- black.setAttribute("id", "black");
- ItemInfo info;
- info.track = 0;
- while (dur > 14000) {
- info.startPos = GenTime(i * 14000, m_fps);
- info.endPos = info.startPos + GenTime(13999, m_fps);
- mltInsertClip(info, black, m_blackClip);
- dur = dur - 14000;
- i++;
- }
- if (dur > 0) {
- info.startPos = GenTime(i * 14000, m_fps);
- info.endPos = info.startPos + GenTime(dur, m_fps);
- mltInsertClip(info, black, m_blackClip);
+ if (blackTrackProducer.get_playtime() - 1 != duration) {
+ Mlt::Playlist blackTrackPlaylist((mlt_playlist) blackTrackProducer.get_service());
+ Mlt::Producer *blackclip = blackTrackPlaylist.get_clip(0);
+ if (blackclip && blackclip->is_blank()) {
+ delete blackclip;
+ blackclip = NULL;
+ }
+
+ if (blackclip == NULL || blackTrackPlaylist.count() != 1) {
+ blackTrackPlaylist.clear();
+ 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((int)duration);
+ emit durationChanged(duration);
}
}
-void Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
- if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
- return;
+Mlt::Producer *Render::checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element)
+{
+ if (element.attribute("speed", "1.0").toDouble() == 1.0 && element.attribute("strobe", "1").toInt() == 1) return prod;
+
+ // We want a slowmotion producer
+ double speed = element.attribute("speed", "1.0").toDouble();
+ int strobe = element.attribute("strobe", "1").toInt();
+ QString url = QString::fromUtf8(prod->get("resource"));
+ url.append('?' + QString::number(speed));
+ if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
+ Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+ if (!slowprod || slowprod->get_producer() == NULL) {
+ char *tmp = decodedString(url);
+ slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+ if (strobe > 1) slowprod->set("strobe", strobe);
+ delete[] tmp;
+ QString id = prod->get("id");
+ if (id.contains('_')) id = id.section('_', 0, 0);
+ QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
+ if (strobe > 1) producerid.append(':' + QString::number(strobe));
+ tmp = decodedString(producerid);
+ slowprod->set("id", tmp);
+ delete[] tmp;
+ m_slowmotionProducers.insert(url, slowprod);
+ }
+ return slowprod;
+}
+
+int Render::mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite, bool push)
+{
+ if (m_mltProducer == NULL) {
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
+ 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;
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ 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 -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: "<<info.cropStart.frames(m_fps)<<", "<<info.startPos.frames(m_fps)<<"-"<<info.endPos.frames(m_fps);
- 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);
+ prod = checkSlowMotionProducer(prod, element);
+ if (prod == NULL || !prod->is_valid()) {
+ mlt_service_unlock(service.get_service());
+ return -1;
+ }
+ int cutPos = (int) info.cropStart.frames(m_fps);
+ if (cutPos < 0) cutPos = 0;
+ int insertPos = (int) info.startPos.frames(m_fps);
+ int cutDuration = (int)(info.endPos - info.startPos).frames(m_fps) - 1;
+ Mlt::Producer *clip = prod->cut(cutPos, cutDuration + cutPos);
+ 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) {
-
+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));
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
int cutPos = (int) position.frames(m_fps);
}
Mlt::Service clipService(original->get_service());
Mlt::Service dupService(clip->get_service());
+ delete original;
+ delete clip;
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (filter->get("kdenlive_id") != "") {
+ // Only duplicate Kdenlive filters, and skip the fade in effects
+ if (filter->is_valid() && strcmp(filter->get("kdenlive_id"), "") && strcmp(filter->get("kdenlive_id"), "fadein") && strcmp(filter->get("kdenlive_id"), "fade_from_black")) {
// looks like there is no easy way to duplicate a filter,
// so we will create a new one and duplicate its properties
Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service"));
- Mlt::Properties entries(filter->get_properties());
- for (int i = 0;i < entries.count();i++) {
- dup->set(entries.get_name(i), entries.get(i));
+ if (dup && dup->is_valid()) {
+ Mlt::Properties entries(filter->get_properties());
+ for (int i = 0; i < entries.count(); i++) {
+ dup->set(entries.get_name(i), entries.get(i));
+ }
+ dupService.attach(*dup);
}
- dupService.attach(*dup);
}
ct++;
filter = clipService.filter(ct);
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
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);
+ 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";
+ return false;
+ }
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(info.track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ int startPos = info.startPos.frames(m_fps);
+ int clipIndex = trackPlaylist.get_clip_index_at(startPos);
+ if (trackPlaylist.is_blank(clipIndex)) {
+ kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << startPos;
+ return false;
+ }
+ mlt_service_lock(service.get_service());
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ // keep effects
+ QList <Mlt::Filter *> 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) {
+bool Render::mltRemoveClip(int track, GenTime position)
+{
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::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
- /* // Display playlist info
- kDebug()<<"//// BEFORE";
- for (int i = 0; i < trackPlaylist.count(); i++) {
+ // 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 "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
-
if (trackPlaylist.is_blank(clipIndex)) {
- kDebug() << "// WARMNING, TRYING TO REMOVE A BLANK: " << clipIndex << ", AT: " << position.frames(25);
+ kDebug() << "// WARNING, TRYING TO REMOVE A BLANK: " << position.frames(25);
+ mlt_service_unlock(service.get_service());
return false;
}
+ //kDebug()<<"//// Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------";
m_isBlocked = true;
- Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
- trackPlaylist.replace_with_blank(clipIndex);
+ Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
+ if (clip) delete clip;
trackPlaylist.consolidate_blanks(0);
/*if (QString(clip.parent().get("transparency")).toInt() == 1)
mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());*/
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
-
- if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength();
+ mlt_service_unlock(service.get_service());
+ if (track != 0 && trackPlaylist.count() <= clipIndex) mltCheckLength(&tractor);
m_isBlocked = false;
return true;
}
-int Render::mltGetSpaceLength(const GenTime pos, int track) {
+int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart)
+{
if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
- return -1;
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
+ return 0;
}
Mlt::Producer parentProd(m_mltProducer->parent());
if (parentProd.get_producer() == NULL) {
- kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
- return -1;
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ return 0;
}
Mlt::Service service(parentProd.get_service());
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;
- return trackPlaylist.clip_length(clipIndex);
+ 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;
}
+int Render::mltTrackDuration(int track)
+{
+ if (!m_mltProducer) {
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
+ return -1;
+ }
+ Mlt::Producer parentProd(m_mltProducer->parent());
+ if (parentProd.get_producer() == NULL) {
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ return -1;
+ }
-void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration) {
+ Mlt::Service service(parentProd.get_service());
+ Mlt::Tractor tractor(service);
+
+ Mlt::Producer trackProducer(tractor.track(track));
+ return trackProducer.get_playtime() - 1;
+}
+
+void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset)
+{
if (!m_mltProducer) {
- kDebug() << "PLAYLIST NOT INITIALISED //////";
+ kDebug() << "PLAYLIST NOT INITIALISED //////";
return;
}
Mlt::Producer parentProd(m_mltProducer->parent());
if (parentProd.get_producer() == NULL) {
- kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
+ kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
+ //kDebug()<<"// CLP STRT LST: "<<trackClipStartList;
+ //kDebug()<<"// TRA STRT LST: "<<trackTransitionStartList;
Mlt::Service service(parentProd.get_service());
Mlt::Tractor tractor(service);
mlt_service_lock(service.get_service());
- int insertPos = pos.frames(m_fps);
int diff = duration.frames(m_fps);
+ int offset = timeOffset.frames(m_fps);
+ int insertPos;
if (track != -1) {
// insert space in one track only
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
- int position = trackPlaylist.clip_start(clipIndex);
- trackPlaylist.remove_region(position, -diff - 1);
+ insertPos = trackClipStartList.value(track);
+ if (insertPos != -1) {
+ insertPos += offset;
+ 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;
+ }
+ int position = trackPlaylist.clip_start(clipIndex);
+ int blankDuration = trackPlaylist.clip_length(clipIndex);
+ diff = -diff;
+ if (blankDuration - diff == 0) {
+ trackPlaylist.remove(clipIndex);
+ } else trackPlaylist.remove_region(position, diff);
+ }
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.consolidate_blanks(0);
-
- // now move transitions
+ // now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(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);
-
- if (track == currentTrack && currentOut > insertPos && resource != "mix") {
- mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ insertPos = trackTransitionStartList.value(track);
+ if (insertPos != -1) {
+ insertPos += offset;
+ if (track == currentTrack && currentOut > insertPos && resource != "mix") {
+ mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ }
}
nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
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 clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
- int position = trackPlaylist.clip_start(clipIndex);
- trackPlaylist.remove_region(position, -diff - 1);
+
+ //int clipNb = trackPlaylist.count();
+ insertPos = trackClipStartList.value(trackNb);
+ if (insertPos != -1) {
+ insertPos += offset;
+
+ /* kDebug()<<"-------------\nTRACK "<<trackNb<<" HAS "<<clipNb<<" CLPIS";
+ kDebug() << "INSERT SPACE AT: "<<insertPos<<", DIFF: "<<diff<<", TK: "<<trackNb;
+ for (int i = 0; i < clipNb; i++) {
+ kDebug()<<"CLIP "<<i<<", START: "<<trackPlaylist.clip_start(i)<<", END: "<<trackPlaylist.clip_start(i) + trackPlaylist.clip_length(i);
+ if (trackPlaylist.is_blank(i)) kDebug()<<"++ BLANK ++ ";
+ kDebug()<<"-------------";
+ }
+ kDebug()<<"END-------------";*/
+
+
+ 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;
+ }
+ int position = trackPlaylist.clip_start(clipIndex);
+ int blankDuration = trackPlaylist.clip_length(clipIndex);
+ if (diff + blankDuration == 0) {
+ trackPlaylist.remove(clipIndex);
+ } else trackPlaylist.remove_region(position, - diff);
+ }
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.consolidate_blanks(0);
- trackNb--;
}
- // now move transitions
+ // now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
mlt_transition tr = (mlt_transition) nextservice;
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
-
- if (currentOut > insertPos && resource != "mix") {
- mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ int currentTrack = mlt_transition_get_b_track(tr);
+ insertPos = trackTransitionStartList.value(currentTrack);
+ if (insertPos != -1) {
+ insertPos += offset;
+ if (currentOut > insertPos && resource != "mix") {
+ mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ }
}
nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
}
}
mlt_service_unlock(service.get_service());
+ 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());
+
+ // move all effects to the correct producer
+ int ct = 0;
+ Mlt::Filter *filter = sourceService.filter(ct);
+ while (filter) {
+ if (filter->get_int("kdenlive_ix") != 0) {
+ sourceService.detach(*filter);
+ destService.attach(*filter);
+ } else ct++;
+ filter = sourceService.filter(ct);
+ }
}
-int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, 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";
- kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1;
+ 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));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(startPos);
int clipLength = trackPlaylist.clip_length(clipIndex);
- Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
- QString serv = clip.parent().get("mlt_service");
- QString id = clip.parent().get("id");
- kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service");
- if (serv == "avformat" && speed != 1.0) {
+ Mlt::Producer *original = trackPlaylist.get_clip(clipIndex);
+ if (original == NULL) {
+ return -1;
+ }
+ if (!original->is_valid() || original->is_blank()) {
+ // invalid clip
+ delete original;
+ return -1;
+ }
+ Mlt::Producer clipparent = original->parent();
+ if (!clipparent.is_valid() || clipparent.is_blank()) {
+ // invalid 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());
- QString url = clip.parent().get("resource");
- url.append("?" + QString::number(speed));
+ QString url = QString::fromUtf8(clipparent.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);
+ char *tmp = decodedString("framebuffer:" + url);
+ slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp);
+ if (strobe > 1) slowprod->set("strobe", strobe);
delete[] tmp;
- QString producerid = "slowmotion:" + id + ":" + QString::number(speed);
+ QString producerid = "slowmotion:" + id + ':' + QString::number(speed);
+ if (strobe > 1) producerid.append(':' + QString::number(strobe));
tmp = decodedString(producerid);
slowprod->set("id", tmp);
delete[] tmp;
+ // 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);
}
- trackPlaylist.replace_with_blank(clipIndex);
+ 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);
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.frames(m_fps) + clipLength) / speed - 1));
- trackPlaylist.insert_at(startPos, *cut, 1);
+
+ // move all effects to the correct producer
+ mltPasteEffects(clip, cut);
+ trackPlaylist.insert_at(startPos, cut, 1);
+ delete cut;
+ delete clip;
clipIndex = trackPlaylist.get_clip_index_at(startPos);
newLength = trackPlaylist.clip_length(clipIndex);
mlt_service_unlock(service.get_service());
- } else if (speed == 1.0) {
+ } else if (speed == 1.0 && strobe < 2) {
mlt_service_lock(service.get_service());
- trackPlaylist.replace_with_blank(clipIndex);
+ Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
// Check that the blank space is long enough for our new duration
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);
- trackPlaylist.insert_at(startPos, *cut, 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);
+
+ trackPlaylist.insert_at(startPos, cut, 1);
+ delete cut;
+ delete clip;
clipIndex = trackPlaylist.get_clip_index_at(startPos);
newLength = trackPlaylist.clip_length(clipIndex);
mlt_service_unlock(service.get_service());
} else if (serv == "framebuffer") {
mlt_service_lock(service.get_service());
- QString url = clip.parent().get("resource");
- url = url.section("?", 0, 0);
- url.append("?" + QString::number(speed));
+ QString url = QString::fromUtf8(clipparent.get("resource"));
+ url = url.section('?', 0, 0);
+ 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);
+ char *tmp = decodedString("framebuffer:" + url);
+ slowprod = new Mlt::Producer(*m_mltProfile, 0, tmp);
delete[] tmp;
- QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed);
+ 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;
+ // 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);
}
- trackPlaylist.replace_with_blank(clipIndex);
+ 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)), (int)(info.cropStart.frames(m_fps) + 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);
- trackPlaylist.insert_at(startPos, *cut, 1);
+ // move all effects to the correct producer
+ mltPasteEffects(clip, cut);
+
+ trackPlaylist.insert_at(startPos, cut, 1);
+ delete cut;
+ delete clip;
clipIndex = trackPlaylist.get_clip_index_at(startPos);
newLength = trackPlaylist.clip_length(clipIndex);
mlt_service_unlock(service.get_service());
}
- if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength();
+ delete original;
+ if (clipIndex + 1 == trackPlaylist.count()) mltCheckLength(&tractor);
m_isBlocked = false;
return newLength;
}
-bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) {
+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" && 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() << " / / / DLEETED EFFECT: " << ct;
+ //kDebug()<<"Deleted filter id:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->get("mlt_service");
+ } 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());
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, QHash <QString, QString> args, bool doRefresh) {
+
+bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
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());
+ 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;
+ 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;
m_isBlocked = true;
+ mlt_service_lock(service.get_service());
+
+ Mlt::Filter *filter = service.filter(ct);
+ while (filter) {
+ 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 <Mlt::Filter *> filtersList;
- const int filer_ix = QString(args.value("kdenlive_ix")).toInt();
- int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
+ ct = 0;
+ filter = service.filter(ct);
while (filter) {
- if (QString(filter->get("kdenlive_ix")).toInt() > filer_ix) {
+ if (filter->get_int("kdenlive_ix") >= filter_ix) {
filtersList.append(filter);
- clipService.detach(*filter);
+ service.detach(*filter);
} else ct++;
- filter = clipService.filter(ct);
+ filter = service.filter(ct);
}
// create filter
- QString tag = args.value("tag");
- kDebug() << " / / INSERTING EFFECT: " << tag;
+ QString tag = params.paramValue("tag");
+ kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
if (tag.startsWith("ladspa")) tag = "ladspa";
char *filterTag = decodedString(tag);
- char *filterId = decodedString(args.value("id"));
+ char *filterId = decodedString(params.paramValue("id"));
QHash<QString, QString>::Iterator it;
- QString kfr = args.value("keyframes");
+ QString kfr = params.paramValue("keyframes");
if (!kfr.isEmpty()) {
- QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts);
- kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes");
- char *starttag = decodedString(args.value("starttag", "start"));
- char *endtag = decodedString(args.value("endtag", "end"));
+ 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"));
kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
- int duration = clip->get_playtime();
- double max = args.value("max").toDouble();
- double min = args.value("min").toDouble();
- double factor = args.value("factor", "1").toDouble();
- args.remove("starttag");
- args.remove("endtag");
- args.remove("keyframes");
- args.remove("min");
- args.remove("max");
- args.remove("factor");
+ //double max = params.paramValue("max").toDouble();
+ double min = params.paramValue("min").toDouble();
+ double factor = params.paramValue("factor", "1").toDouble();
+ params.removeParam("starttag");
+ params.removeParam("endtag");
+ params.removeParam("keyframes");
+ params.removeParam("min");
+ 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);
- 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 (it = args.begin(); it != args.end(); ++it) {
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
- filter->set(name, value);
- delete[] name;
- delete[] value;
+ if (filter && filter->is_valid()) {
+ filter->set("kdenlive_id", filterId);
+ 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("in", x1);
+ //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
+ filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
+ 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++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
+ filter->set(name, value);
+ delete[] name;
+ delete[] value;
+ }
+
+ filter->set("in", x1);
+ filter->set("out", x2);
+ //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
+ filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
+ filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data());
+ service.attach(*filter);
+ offset = 1;
+ }
}
-
- filter->set("in", x1);
- filter->set("out", x2);
- //kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
- filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
- filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data());
- clipService.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()) {
+ char *tmp = decodedString(region);
+ filter->set("resource", tmp);
+ tmp = decodedString(params.paramValue("kdenlive_ix"));
+ filter->set("kdenlive_ix", tmp);
+ filter->set("filter0", filterTag);
+ prefix = "filter0.";
+ delete[] tmp;
+ params.removeParam("id");
+ params.removeParam("region");
+ params.removeParam("kdenlive_ix");
+ }
+ } else {
kDebug() << "filter is NULL";
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
return false;
}
+ params.removeParam("kdenlive_id");
- for (it = args.begin(); it != args.end(); ++it) {
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(prefix + params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
}
+
+ if (tag == "sox") {
+ QString effectArgs = params.paramValue("id").section('_', 1);
+
+ params.removeParam("id");
+ params.removeParam("kdenlive_ix");
+ params.removeParam("tag");
+ params.removeParam("disable");
+ params.removeParam("region");
+
+ for (int j = 0; j < params.count(); j++) {
+ effectArgs.append(' ' + params.at(j).value());
+ }
+ //kDebug() << "SOX EFFECTS: " << effectArgs.simplified();
+ char *value = decodedString(effectArgs.simplified());
+ filter->set("effect", value);
+ delete[] value;
+ }
+
+ 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::mltEditEffect(int track, GenTime position, QHash <QString, QString> args) {
- QString index = args.value("kdenlive_ix");
- QString tag = args.value("tag");
- QHash<QString, QString>::Iterator it = args.begin();
- if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
- // This is a keyframe effect, to edit it, we remove it and re-add it.
- mltRemoveEffect(track, position, index);
- bool success = mltAddEffect(track, position, args);
+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++) {
+ char *name = decodedString(prefix + params.at(j).name());
+ char *value = decodedString(params.at(j).value());
+ filter->set(name, value);
+ delete[] name;
+ delete[] value;
+ }
+ mlt_service_unlock(service.get_service());
- // create filter
- Mlt::Service service(m_mltProducer->parent().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" || params.hasParam("region")) {
+ // This is a keyframe effect, to edit it, we remove it and re-add it.
+ 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);
+ 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: "<<index <<", "<<tag;
+ kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
+ while (filter) {
+ kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->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++;
}
if (!filter) {
- kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT!!!!!";
- // 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 <Mlt::Filter *> 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, args);
-
- for (int i = 0; i < filtersList.count(); i++) {
- clipService.attach(*(filtersList.at(i)));
- }
+ 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 = mltAddEffect(track, position, params);
m_isBlocked = false;
return success;
}
-
- for (it = args.begin(); it != args.end(); ++it) {
- kDebug() << " / / EDITING EFFECT ARGS: " << it.key() << ": " << it.value();
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+ 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(prefix + params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
}
+ 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) {
-
- kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
+void Render::mltUpdateEffectPosition(int track, GenTime position, 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());
+
+ 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);
+ 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 <Mlt::Filter *> filtersList;
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++;
}
} 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);
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);
}
m_isBlocked = false;
- refresh();
+ if (doRefresh) refresh();
}
-bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration) {
+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 <Mlt::Filter *> 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);
+ }
- Mlt::Service service(m_mltProducer->parent().get_service());
+ 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();
+}
+
+bool Render::mltResizeClipEnd(ItemInfo info, GenTime clipDuration)
+{
+ m_isBlocked = true;
+ Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int blankDuration = trackPlaylist.clip_length(i) - 1;
QString blk;
if (trackPlaylist.is_blank(i)) blk = "(blank)";
- kDebug()<<"CLIP "<<i<<": ("<<blankStart<<"x"<<blankStart + blankDuration<<")"<<blk;
+ kDebug()<<"CLIP "<<i<<": ("<<blankStart<<'x'<<blankStart + blankDuration<<")"<<blk;
}*/
if (trackPlaylist.is_blank_at((int) info.startPos.frames(m_fps))) {
m_isBlocked = false;
return false;
}
+ mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
- kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
+ //kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
int previousStart = clip->get_in();
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
int newDuration = (int) clipDuration.frames(m_fps) - 1;
+ int currentOut = (int)(info.cropStart + info.cropDuration).frames(m_fps) - 1;
+ int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1);
+ 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()) {
+ 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);
+ trackPlaylist.consolidate_blanks(0);
// skip to next clip
clipIndex++;
- int diff = newDuration - previousDuration;
- kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration;
+ //kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration << ", IX: " << clipIndex << ", MAX: " << trackPlaylist.count();
if (diff > 0) {
// clip was made longer, trim next blank if there is one.
- if (trackPlaylist.is_blank(clipIndex)) {
- int blankStart = trackPlaylist.clip_start(clipIndex);
- int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
- if (diff - blankDuration == 1) {
- trackPlaylist.remove(clipIndex);
- } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff);
- } else {
- kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex;
+ if (clipIndex < trackPlaylist.count()) {
+ // If this is not the last clip in playlist
+ 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 == 0) {
+ trackPlaylist.remove(clipIndex);
+ } else trackPlaylist.remove_region(blankStart, diff);
+ } else {
+ 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());
mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
}*/
m_isBlocked = false;
+ m_mltConsumer->set("refresh", 1);
return true;
}
-void Render::mltChangeTrackState(int track, bool mute, bool blind) {
+void Render::mltChangeTrackState(int track, bool mute, bool blind)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
refresh();
}
-bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
+
+bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
+{
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ int frameOffset = (int) diff.frames(m_fps);
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(info.track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) {
+ kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
+ return false;
+ }
+ 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) {
+ kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
+ mlt_service_unlock(service.get_service());
+ return false;
+ }
+ int previousStart = clip->get_in();
+ int previousOut = clip->get_out();
+ delete clip;
+ m_isBlocked = true;
+ trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousOut + frameOffset);
+ m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
+ return true;
+}
+
+bool Render::mltResizeClipStart(ItemInfo info, GenTime diff)
+{
//kDebug() << "//////// RSIZING CLIP from: "<<info.startPos.frames(25)<<" to "<<diff.frames(25);
Mlt::Service service(m_mltProducer->parent().get_service());
int moveFrame = (int) diff.frames(m_fps);
}
mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
- /*int previousStart = trackPlaylist.clip_start(clipIndex);
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/
- //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25);
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;
}
- //m_mltConsumer->set("refresh", 0);
int previousStart = clip->get_in();
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ int previousOut = clip->get_out();
+ delete clip;
m_isBlocked = true;
- kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
- trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
+ previousStart += moveFrame;
+ if (previousStart < 0) {
+ // special case, in point becoming negative (resizing images)
+ previousOut -= previousStart;
+ previousStart = 0;
+ }
+ // kDebug() << "RESIZE, new start: " << previousStart << ", " << previousOut;
+ trackPlaylist.resize_clip(clipIndex, previousStart, previousOut);
if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
else {
//int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
int blankIndex = clipIndex - 1;
int blankLength = trackPlaylist.clip_length(blankIndex);
- kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame;
+ // kDebug() << " + resizing blank length " << blankLength << ", SIZE DIFF: " << moveFrame;
if (! trackPlaylist.is_blank(blankIndex)) {
kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK";
}
m_isBlocked = false;
//m_mltConsumer->set("refresh", 1);
mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
return true;
}
-bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd, Mlt::Producer *prod) {
- return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps), 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, 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 false;
+ }
kDebug() << "NEW PROD ID: " << prod->get("id");
- m_mltConsumer->set("refresh", 0);
+ 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);
- Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
- if (clipProducer.is_blank()) {
+ int clipIndex = trackPlaylist.get_clip_index_at(pos);
+ Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
+ if (clipProducer == NULL || clipProducer->is_blank()) {
kDebug() << "// ERROR UPDATING CLIP PROD";
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
- return;
+ delete clipProducer;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
+ return false;
}
- Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
-
- // move all effects to the correct producer
- Mlt::Service clipService(clipProducer.get_service());
- Mlt::Service newClipService(clip->get_service());
-
- int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
- while (filter) {
- if (filter->get("kdenlive_ix") != 0) {
- clipService.detach(*filter);
- newClipService.attach(*filter);
- } else ct++;
- filter = clipService.filter(ct);
+ 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);
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ delete clip;
+ delete clipProducer;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
+ return true;
}
-bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod) {
- m_isBlocked = true;
+bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd, Mlt::Producer *prod, bool overwrite, bool /*insert*/)
+{
+ m_isBlocked++;
- m_mltConsumer->set("refresh", 0);
- 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::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
Mlt::Producer trackProducer(tractor.track(startTrack));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
+ int clipIndex = trackPlaylist.get_clip_index_at(moveStart);
kDebug() << "////// LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
bool checkLength = false;
if (endTrack == startTrack) {
- //mlt_service_lock(service.get_service());
- Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
- if (!trackPlaylist.is_blank_at(moveEnd) || clipProducer.is_blank()) {
+ Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
+ if ((!overwrite && !trackPlaylist.is_blank_at(moveEnd)) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
// error, destination is not empty
+ 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(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
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());
}*/
} 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(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
} else {
- Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
- if (clipProducer.is_blank()) {
+ Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
+ if (!clipProducer || clipProducer->is_blank()) {
// error, destination is not empty
//int ix = trackPlaylist.get_clip_index_at(moveEnd);
+ if (clipProducer) delete clipProducer;
kDebug() << "// ERROR MOVING CLIP TO : " << moveEnd;
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
return false;
}
trackPlaylist.consolidate_blanks(0);
destTrackPlaylist.consolidate_blanks(1);
Mlt::Producer *clip;
// check if we are moving a slowmotion producer
- QString serv = clipProducer.parent().get("mlt_service");
- if (serv == "framebuffer") {
- clip = &clipProducer;
- } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out());
+ QString serv = clipProducer->parent().get("mlt_service");
+ QString currentid = clipProducer->parent().get("id");
+ if (serv == "framebuffer" || currentid.endsWith("_video")) {
+ clip = clipProducer;
+ } else {
+ if (prod == NULL) {
+ // Special case: prod is null when using placeholder clips.
+ // in that case, use the producer existing in playlist. Note that
+ // it will bypass the one producer per track logic and might cause
+ // Sound cracks if clip is moved so that it overlaps another copy of itself
+ clip = clipProducer->cut(clipProducer->get_in(), clipProducer->get_out());
+ } else clip = prod->cut(clipProducer->get_in(), clipProducer->get_out());
+ }
// move all effects to the correct producer
- Mlt::Service clipService(clipProducer.get_service());
- Mlt::Service newClipService(clip->get_service());
-
- int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
- while (filter) {
- if (filter->get("kdenlive_ix") != 0) {
- clipService.detach(*filter);
- newClipService.attach(*filter);
- } else ct++;
- filter = clipService.filter(ct);
+ 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;
+ } else {
+ delete clip;
+ delete clipProducer;
+ }
destTrackPlaylist.consolidate_blanks(0);
/*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
kDebug() << "//////// moving clip transparency";
else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true;
}
}
-
- if (checkLength) mltCheckLength();
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
- m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(service.get_service());
+ if (checkLength) mltCheckLength(&tractor);
+ m_isBlocked--;
+ //askForRefresh();
+ //m_mltConsumer->set("refresh", 1);
return true;
}
-void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
+
+QList <int> Render::checkTrackSequence(int track)
+{
+ QList <int> 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 service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
+ bool doRefresh = true;
+ // Check if clip is visible in monitor
+ int diff = old_out - m_mltProducer->position();
+ if (diff < 0 || diff > old_out - old_in) doRefresh = false;
+ if (doRefresh) {
+ diff = new_out - m_mltProducer->position();
+ if (diff < 0 || diff > new_out - new_in) doRefresh = false;
+ }
+
+ m_isBlocked++;
mlt_service_lock(service.get_service());
- m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
- mlt_service serv = m_mltProducer->parent().get_service();
- mlt_service nextservice = mlt_service_get_producer(serv);
+ 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 new_in = (int)newIn.frames(m_fps);
- int new_out = (int)newOut.frames(m_fps) - 1;
+ 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: "<<trackOffset<<", TRACKS: "<<mlt_transition_get_a_track(tr)<<"x"<<mlt_transition_get_b_track(tr);
- }
+ Mlt::Properties trans_props(transition.get_properties());
+ char *tmp = decodedString(transition.get("mlt_service"));
+ Mlt::Transition new_transition(*m_mltProfile, tmp);
+ delete[] tmp;
+ Mlt::Properties new_trans_props(new_transition.get_properties());
+ new_trans_props.inherit(trans_props);
+ new_transition.set_in_and_out(new_in, new_out);
+ field->disconnect_service(transition);
+ 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);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
mlt_service_unlock(service.get_service());
- m_mltConsumer->set("refresh", 1);
+ m_isBlocked--;
+ if (doRefresh) refresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
+ return found;
+}
+
+
+void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track)
+{
+ mlt_service nextservice = mlt_service_get_producer(field->get_service());
+ mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+ QString mlt_type = mlt_properties_get(properties, "mlt_type");
+ QString resource = mlt_properties_get(properties, "mlt_service");
+ QList <Mlt::Transition *> trList;
+
+ while (mlt_type == "transition") {
+ Mlt::Transition transition((mlt_transition) nextservice);
+ int aTrack = transition.get_a_track();
+ int bTrack = transition.get_b_track();
+ if (resource != "mix" && (aTrack < a_track || (aTrack == a_track && bTrack > b_track))) {
+ Mlt::Properties trans_props(transition.get_properties());
+ char *tmp = decodedString(transition.get("mlt_service"));
+ Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, tmp);
+ delete[] tmp;
+ Mlt::Properties new_trans_props(cp->get_properties());
+ new_trans_props.inherit(trans_props);
+ trList.append(cp);
+ field->disconnect_service(transition);
+ }
+ //else kDebug() << "// FOUND TRANS OK, "<<resource<< ", A_: " << aTrack << ", B_ "<<bTrack;
+
+ 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");
+ }
+
+ field->plant_transition(tr, a_track, b_track);
+
+ // re-add upper transitions
+ for (int i = 0; i < trList.count(); i++) {
+ // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->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) {
- // kDebug() << "update transition" << tag << " at pos " << in.frames(25);
- if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
+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);
+ mltAddTransition(tag, a_track, b_track, in, out, xml, false);
}
- //mltSavePlaylist();
-}
-void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
- m_isBlocked = true;
- Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
+ if (m_mltProducer->position() > in.frames(m_fps) && m_mltProducer->position() < out.frames(m_fps)) refresh();
+}
- //m_mltConsumer->set("refresh", 0);
+void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
+{
mlt_service serv = m_mltProducer->parent().get_service();
+ mlt_service_lock(serv);
+ m_isBlocked++;
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
- // kDebug()<<"Looking for transition : " << currentIn <<"x"<<currentOut<< ", OLD oNE: "<<in_pos<<"x"<<out_pos;
+ // kDebug()<<"Looking for transition : " << currentIn <<'x'<<currentOut<< ", OLD oNE: "<<in_pos<<'x'<<out_pos;
if (resource == type && b_track == currentTrack && currentIn == in_pos && currentOut == out_pos) {
QMap<QString, QString> map = mltGetTransitionParamsFromXml(xml);
QMap<QString, QString>::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
+ char *tmp = decodedString(xml.attribute("id"));
+ mlt_properties_set(transproperties, "kdenlive_id", tmp);
+ delete[] tmp;
+ // 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)) {
+ tmp = decodedString(propName);
+ mlt_properties_set(transproperties, tmp, "");
+ delete[] tmp;
+ }
+ }
+ }
+
mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt());
+ 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;
+ //kDebug() << " ------ UPDATING TRANS PARAM: " << name << ": " << value;
//filter->set("kdenlive_id", id);
delete[] name;
delete[] value;
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
- m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
-void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
- Mlt::Service service(m_mltProducer->parent().get_service());
+void Render::mltDeleteTransition(QString tag, int /*a_track*/, int b_track, GenTime in, GenTime out, QDomElement /*xml*/, bool /*do_refresh*/)
+{
+ mlt_service serv = m_mltProducer->parent().get_service();
+ m_isBlocked++;
+ mlt_service_lock(serv);
+
+ Mlt::Service service(serv);
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
//if (do_refresh) m_mltConsumer->set("refresh", 0);
- mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString resource = mlt_properties_get(properties, "mlt_service");
const int old_pos = (int)((in + out).frames(m_fps) / 2);
+ kDebug() << " del trans pos: " << in.frames(25) << "-" << out.frames(25);
while (mlt_type == "transition") {
mlt_transition tr = (mlt_transition) nextservice;
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- //if (do_refresh) m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+ //askForRefresh();
+ //if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
-QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
+QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml)
+{
QDomNodeList attribs = xml.elementsByTagName("parameter");
QMap<QString, QString> map;
- for (int i = 0;i < attribs.count();i++) {
+ for (int i = 0; i < attribs.count(); i++) {
QDomElement e = attribs.item(i).toElement();
QString name = e.attribute("name");
- //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
+ //kDebug()<<"-- TRANSITION PARAM: "<<name<<" = "<< e.attribute("name")<<" / " << e.attribute("value");
map[name] = e.attribute("default");
if (!e.attribute("value").isEmpty()) {
map[name] = e.attribute("value");
//map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
}
- if (e.attribute("namedesc").contains(";")) {
+ if (e.attribute("namedesc").contains(';')) {
QString format = e.attribute("format");
QStringList separators = format.split("%d", QString::SkipEmptyParts);
QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
if (values.size() > 0)
txtNeu << (int)values[0].toDouble();
int i = 0;
- for (i = 0;i < separators.size() && i + 1 < values.size();i++) {
+ for (i = 0; i < separators.size() && i + 1 < values.size(); i++) {
txtNeu << separators[i];
txtNeu << (int)(values[i+1].toDouble());
}
return map;
}
-void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id) {
+void Render::mltAddClipTransparency(ItemInfo info, int transitiontrack, int id)
+{
kDebug() << "///////// ADDING CLIP TRANSPARENCY AT: " << info.startPos.frames(25);
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
refresh();
}
-void Render::mltDeleteTransparency(int pos, int track, int id) {
+void Render::mltDeleteTransparency(int pos, int track, int id)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
//if (do_refresh) m_mltConsumer->set("refresh", 1);
}
-void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id) {
+void Render::mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
mlt_service_lock(service.get_service());
m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
+ m_isBlocked++;
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString mlt_type = mlt_properties_get(properties, "mlt_type");
QString resource = mlt_properties_get(properties, "mlt_service");
- kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << "x" << newEnd << ", " << track << ", " << id;
+ kDebug() << "// resize transpar from: " << oldStart << ", TO: " << newStart << 'x' << newEnd << ", " << track << ", " << id;
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);
//mlt_properties props = MLT_TRANSITION_PROPERTIES(tr);
int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
- kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << "x" << transitionId ;
+ kDebug() << "// resize transpar current in: " << currentIn << ", Track: " << currentTrack << ", id: " << id << 'x' << transitionId ;
if (resource == "composite" && track == currentTrack && currentIn == oldStart && transitionId == id) {
- kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << "x" << newEnd;
+ kDebug() << " / / / / /RESIZE TRANS TO: " << newStart << 'x' << newEnd;
mlt_transition_set_in_and_out(tr, newStart, newEnd);
break;
}
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
mlt_service_unlock(service.get_service());
- m_mltConsumer->set("refresh", 1);
+ m_isBlocked--;
+ if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
}
-void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id) {
+void Render::mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id)
+{
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
- Mlt::Field *field = tractor.field();
mlt_service_lock(service.get_service());
m_mltConsumer->set("refresh", 0);
- m_isBlocked = true;
+ m_isBlocked++;
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
int currentOut = (int) mlt_transition_get_out(tr);
//mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
int transitionId = QString(mlt_properties_get(properties, "transparency")).toInt();
- //kDebug()<<" + TRANSITION "<<id<<" == "<<transitionId<<", START TMIE: "<<currentIn<<", LOOK FR: "<<startTime<<", TRACK: "<<currentTrack<<"x"<<startTrack;
+ //kDebug()<<" + TRANSITION "<<id<<" == "<<transitionId<<", START TMIE: "<<currentIn<<", LOOK FR: "<<startTime<<", TRACK: "<<currentTrack<<'x'<<startTrack;
if (resource == "composite" && transitionId == id && startTime == currentIn && startTrack == currentTrack) {
kDebug() << "//////MOVING";
mlt_transition_set_in_and_out(tr, endTime, endTime + currentOut - currentIn);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
- m_isBlocked = false;
+ m_isBlocked--;
mlt_service_unlock(service.get_service());
m_mltConsumer->set("refresh", 1);
}
-void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
-
+bool Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh)
+{
+ if (in >= out) return false;
QMap<QString, QString> args = mltGetTransitionParamsFromXml(xml);
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId);
if (out != GenTime())
transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
+
+ if (do_refresh && (m_mltProducer->position() < in.frames(m_fps) || m_mltProducer->position() > out.frames(m_fps))) do_refresh = false;
QMap<QString, QString>::Iterator it;
QString key;
if (xml.attribute("automatic") == "1") transition->set("automatic", 1);
//kDebug() << " ------ ADDING TRANSITION PARAMs: " << args.count();
+ if (xml.hasAttribute("id"))
+ transition->set("kdenlive_id", xml.attribute("id").toUtf8().constData());
for (it = args.begin(); it != args.end(); ++it) {
key = it.key();
char *name = decodedString(key);
char *value = decodedString(it.value());
- transition->set(name, value);
- kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value;
- //filter->set("kdenlive_id", id);
+ 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);
+ // attach transition
+ mltPlantTransition(field, *transition, a_track, b_track);
+ // field->plant_transition(*transition, a_track, b_track);
delete[] transId;
- refresh();
+ if (do_refresh) refresh();
+ return true;
}
-void Render::mltSavePlaylist() {
+void Render::mltSavePlaylist()
+{
kWarning() << "// UPDATING PLAYLIST TO DISK++++++++++++++++";
- Mlt::Consumer fileConsumer(*m_mltProfile, "westley");
- fileConsumer.set("resource", "/tmp/playlist.westley");
+ Mlt::Consumer fileConsumer(*m_mltProfile, "xml");
+ fileConsumer.set("resource", "/tmp/playlist.mlt");
Mlt::Service service(m_mltProducer->get_service());
fileConsumer.start();
}
-QList <Mlt::Producer *> Render::producersList() {
- QList <Mlt::Producer *> prods = QList <Mlt::Producer *> ();
- QStringList ids;
+const QList <Mlt::Producer *> Render::producersList()
+{
+ QList <Mlt::Producer *> prods;
+ if (m_mltProducer == NULL) return prods;
Mlt::Service service(m_mltProducer->parent().get_service());
+ if (service.type() != tractor_type) return prods;
Mlt::Tractor tractor(service);
+ QStringList ids;
int trackNb = tractor.count();
for (int t = 1; t < trackNb; t++) {
- Mlt::Producer trackProducer(tractor.track(t));
+ Mlt::Producer *tt = tractor.track(t);
+ Mlt::Producer trackProducer(tt);
+ delete tt;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipNb = trackPlaylist.count();
- kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb;
+ //kDebug() << "// PARSING SCENE TRACK: " << t << ", CLIPS: " << clipNb;
for (int i = 0; i < clipNb; i++) {
- Mlt::Producer *prod = trackPlaylist.get_clip(i);
- Mlt::Producer *nprod = new Mlt::Producer(prod->get_parent());
- //kDebug()<<"PROD: "<<nprod->get("producer")<<", ID: "<<nprod->get("id")<<nprod->get("resource");
- if (nprod && !nprod->is_blank() && !ids.contains(nprod->get("id"))) {
- ids.append(nprod->get("id"));
- prods.append(nprod);
+ Mlt::Producer *c = trackPlaylist.get_clip(i);
+ Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
+ if (nprod) {
+ if (!nprod->is_blank() && !ids.contains(nprod->get("id"))) {
+ ids.append(nprod->get("id"));
+ prods.append(nprod);
+ } else delete nprod;
}
+ delete c;
}
}
return prods;
}
-void Render::mltInsertTrack(int ix, bool videoTrack) {
+void Render::fillSlowMotionProducers()
+{
+ if (m_mltProducer == NULL) return;
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ if (service.type() != tractor_type) return;
+
+ Mlt::Tractor tractor(service);
+
+ int trackNb = tractor.count();
+ for (int t = 1; t < trackNb; t++) {
+ Mlt::Producer *tt = tractor.track(t);
+ Mlt::Producer trackProducer(tt);
+ delete tt;
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ int clipNb = trackPlaylist.count();
+ for (int i = 0; i < clipNb; i++) {
+ Mlt::Producer *c = trackPlaylist.get_clip(i);
+ Mlt::Producer *nprod = new Mlt::Producer(c->get_parent());
+ if (nprod) {
+ QString id = nprod->get("id");
+ if (id.startsWith("slowmotion:") && !nprod->is_blank()) {
+ // this is a slowmotion producer, add it to the list
+ QString url = QString::fromUtf8(nprod->get("resource"));
+ int strobe = nprod->get_int("strobe");
+ if (strobe > 1) url.append("&strobe=" + QString::number(strobe));
+ if (!m_slowmotionProducers.contains(url)) {
+ m_slowmotionProducers.insert(url, nprod);
+ }
+ } else delete nprod;
+ }
+ delete c;
+ }
+ }
+}
+
+void Render::mltInsertTrack(int ix, bool videoTrack)
+{
blockSignals(true);
- m_isBlocked = true;
+ m_isBlocked++;
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ mlt_service_lock(service.get_service());
+ if (service.type() != tractor_type) {
+ kWarning() << "// TRACTOR PROBLEM";
+ return;
+ }
Mlt::Tractor tractor(service);
- Mlt::Playlist *playlist = new Mlt::Playlist();
+ Mlt::Playlist playlist;
int ct = tractor.count();
- // kDebug() << "// TRACK INSERT: " << ix << ", MAX: " << ct;
+ if (ix > ct) {
+ kDebug() << "// ERROR, TRYING TO insert TRACK " << ix << ", max: " << ct;
+ ix = ct;
+ }
+
int pos = ix;
if (pos < ct) {
Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos));
- tractor.set_track(*playlist, pos);
+ tractor.set_track(playlist, pos);
Mlt::Producer newProd(tractor.track(pos));
if (!videoTrack) newProd.set("hide", 1);
pos++;
prodToMove = prodToMove2;
}
} else {
- tractor.set_track(*playlist, ix);
+ tractor.set_track(playlist, ix);
Mlt::Producer newProd(tractor.track(ix));
if (!videoTrack) newProd.set("hide", 1);
}
// Add audio mix transition to last track
Mlt::Field *field = tractor.field();
Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
- //transition->set("mlt_service", "mix");
transition->set("a_track", 1);
transition->set("b_track", ct);
transition->set("always_active", 1);
transition->set("internal_added", 237);
transition->set("combine", 1);
field->plant_transition(*transition, 1, ct);
-
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
+ //mlt_service_unlock(m_mltConsumer->get_service());
+ mlt_service_unlock(service.get_service());
+ //tractor.multitrack()->refresh();
+ //tractor.refresh();
+ m_isBlocked--;
blockSignals(false);
}
-void Render::mltDeleteTrack(int ix) {
+void Render::mltDeleteTrack(int ix)
+{
QDomDocument doc;
doc.setContent(sceneList(), false);
int tracksCount = doc.elementsByTagName("track").count() - 1;
}
if (mappedProps.value("mlt_service") == "mix" && mappedProps.value("b_track").toInt() == tracksCount) {
tractor.removeChild(transitions.at(i));
- } else if (mappedProps.value("mlt_service") != "mix" && mappedProps.value("b_track").toInt() >= ix) {
+ i--;
+ } else if (mappedProps.value("mlt_service") != "mix" && (mappedProps.value("b_track").toInt() >= ix || mappedProps.value("a_track").toInt() >= ix)) {
// Transition needs to be moved
int a_track = mappedProps.value("a_track").toInt();
int b_track = mappedProps.value("b_track").toInt();
- if (a_track > 0) a_track --;
- if (b_track > 0) b_track --;
+ if (a_track > 0 && a_track >= ix) a_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));
}
}
tractor.removeChild(track);
+ //kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
setSceneList(doc.toString(), m_framePosition);
- return;
- blockSignals(true);
- m_isBlocked = true;
+ /* 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);
+ }
+ }
+ }*/
+}
- m_mltConsumer->set("refresh", 0);
- mlt_service_lock(m_mltConsumer->get_service());
+
+void Render::updatePreviewSettings()
+{
+ kDebug() << "////// RESTARTING CONSUMER";
+ if (!m_mltConsumer || !m_mltProducer) return;
+ if (m_mltProducer->get_playtime() == 0) return;
Mlt::Service service(m_mltProducer->parent().get_service());
- if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+ if (service.type() != tractor_type) return;
- /*Mlt::Tractor tractor(service);
+ //m_mltConsumer->set("refresh", 0);
+ if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+ m_mltConsumer->purge();
+ QString scene = sceneList();
+ int pos = 0;
+ if (m_mltProducer) {
+ pos = m_mltProducer->position();
+ }
+ setSceneList(scene, pos);
+}
- Mlt::Multitrack *multi = tractor.multitrack();
+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);
- int ct = tractor.count();
- kDebug() << "// TRACK REMOVE: " << ix << ", MAX: " << ct;
- int pos = ix;
- for (; pos < ct ; pos++) {
- Mlt::Service *lastTrack = new Mlt::Service(tractor.track(pos)->get_service());
- //mlt_service_close(lastTrack->get_service());
- delete lastTrack;
- Mlt::Producer *prodToMove = new Mlt::Producer(tractor.track(pos + 1));
- Mlt::Producer *prodToClose = new Mlt::Producer(tractor.track(pos));
- mlt_service_close(prodToMove->get_service());
- mlt_service_close(prodToClose->get_service());
- tractor.set_track(*prodToMove, pos);
- }*/
+ 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");
- // Move transitions
- /*mlt_service serv = m_mltProducer->parent().get_service();
- mlt_service nextservice = mlt_service_get_producer(serv);
- mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
- QString mlt_type = mlt_properties_get(properties, "mlt_type");
- QString resource = mlt_properties_get(properties, "mlt_service");
+ 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--;
+ }
+ }
+ }
- while (mlt_type == "transition") {
- if (resource != "mix") {
- mlt_transition tr = (mlt_transition) nextservice;
- int currentTrack = mlt_transition_get_b_track(tr);
- int currentaTrack = mlt_transition_get_a_track(tr);
- mlt_properties properties = MLT_TRANSITION_PROPERTIES(tr);
+ 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);
+ }
- if (currentTrack >= ix) {
- mlt_properties_set_int(properties, "b_track", currentTrack + 1);
- mlt_properties_set_int(properties, "a_track", currentaTrack + 1);
+ 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(";"));
}
}
- 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");
}
+ 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();
+}
- // Add audio mix transition to last track
- Mlt::Field *field = tractor.field();
- Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
- //transition->set("mlt_service", "mix");
- transition->set("a_track", 1);
- transition->set("b_track", ct);
- transition->set("always_active", 1);
- transition->set("internal_added", 237);
- transition->set("combine", 1);
- field->plant_transition(*transition, 1, ct);
- */
- mlt_service_unlock(m_mltConsumer->get_service());
- m_isBlocked = false;
- blockSignals(false);
+void Render::sendFrameUpdate()
+{
+ if (m_mltProducer) {
+ Mlt::Frame * frame = m_mltProducer->get_frame();
+ emitFrameUpdated(*frame);
+ delete frame;
+ }
}
+
#include "renderer.moc"
projects / kdenlive / blobdiff