// ffmpeg Header files
extern "C" {
-//#include <libavformat/avformat.h>
+#include <avformat.h>
}
+
#include <QTimer>
#include <QDir>
#include <QApplication>
#include "renderer.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
+#include "definitions.h"
+
+#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 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->isBlocked) return;
+ if (self->m_isBlocked) return;
if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) {
self->emitConsumerStopped();
} else {
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", winid);
m_mltConsumer->set("terminate_on_pause", 1);
+ m_mltConsumer->set("rescale", "nearest");
+ m_mltConsumer->set("progressive", 1);
+ m_mltConsumer->set("audio_buffer", 1024);
+ m_mltConsumer->set("frequency", 48000);
m_externalwinid = extid;
m_winid = winid;
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltProducer = producer;
m_mltConsumer->connect(*m_mltProducer);
m_mltProducer->set_speed(0.0);
+
//m_mltConsumer->start();
//refresh();
//initSceneList();
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+ m_mltConsumer->set("rescale", "nearest");
+ m_mltConsumer->set("progressive", 1);
+ m_mltConsumer->set("audio_buffer", 1024);
+ m_mltConsumer->set("frequency", 48000);
Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", (char *) scene.toUtf8().data());
m_mltProducer = producer;
return pix;
}
*/
+const int Render::renderWidth() const {
+ return (int)(m_mltProfile->height() * m_mltProfile->dar());
+}
+
+const int Render::renderHeight() const {
+ return m_mltProfile->height();
+}
QPixmap Render::extractFrame(int frame_position, int width, int height) {
+ if (width == -1) {
+ width = renderWidth();
+ height = renderHeight();
+ }
QPixmap pix(width, height);
if (!m_mltProducer) {
pix.fill(Qt::black);
return pix;
}
- //Mlt::Producer *mlt_producer = m_mltProducer->cut(frame_position, frame_position + 1);
- return KThumb::getFrame(m_mltProducer, frame_position, width, height);
+ //TODO: rewrite
+ return pix; //KThumb::getFrame(m_mltProducer, frame_position, width, height);
/*Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
m_convert.set("forced", mlt_image_rgb24a);
mlt_producer->attach(m_convert);
return true;
}
+const double Render::dar() const {
+ return m_mltProfile->dar();
+}
+
void Render::getFileProperties(const QDomElement &xml, int clipId) {
- int height = 40;
- int width = (int)(height * 16 / 9.0); //KdenliveSettings::displayratio();
+ int height = 50;
+ int width = (int)(height * m_mltProfile->dar());
+ QMap < QString, QString > filePropertyMap;
+ QMap < QString, QString > metadataPropertyMap;
+
QDomDocument doc;
QDomElement westley = doc.createElement("westley");
+ QDomElement play = doc.createElement("playlist");
doc.appendChild(westley);
- westley.appendChild(doc.importNode(xml, true));
- kDebug() << "////////////\n" << doc.toString() << "////////////////\n";
+ westley.appendChild(play);
+ play.appendChild(doc.importNode(xml, true));
char *tmp = decodedString(doc.toString());
-
Mlt::Producer producer(*m_mltProfile, "westley-xml", tmp);
delete[] tmp;
if (producer.is_blank()) {
return;
}
- int frameNumber = xml.attribute("frame_thumbnail", 0).toInt();
+
+ int frameNumber = xml.attribute("frame_thumbnail", "0").toInt();
if (frameNumber != 0) producer.seek(frameNumber);
mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer.get_producer());
- QMap < QString, QString > filePropertyMap;
- QMap < QString, QString > metadataPropertyMap;
-
KUrl url = xml.attribute("resource", QString::null);
filePropertyMap["filename"] = url.path();
filePropertyMap["duration"] = QString::number(producer.get_playtime());
- kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
- Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
- m_convert.set("forced", mlt_image_rgb24a);
- producer.attach(m_convert);
- Mlt::Frame * frame = producer.get_frame();
+ //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
- filePropertyMap["fps"] =
- QString::number(mlt_producer_get_fps(producer.get_producer()));
+ Mlt::Frame * frame = producer.get_frame();
+ filePropertyMap["fps"] = producer.get("source_fps");
if (frame && frame->is_valid()) {
- filePropertyMap["width"] =
- QString::number(frame->get_int("width"));
- filePropertyMap["height"] =
- QString::number(frame->get_int("height"));
- filePropertyMap["frequency"] =
- QString::number(frame->get_int("frequency"));
- filePropertyMap["channels"] =
- QString::number(frame->get_int("channels"));
+ 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")) {
else
filePropertyMap["type"] = "video";
- // Generate thumbnail for this frame
- QPixmap pixmap = KThumb::getImage(url, 0, width, height);
+ 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);
+
+ 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);
+
+ if (!image.isNull()) {
+ pix = pix.fromImage(image.rgbSwapped());
+ } else
+ pix.fill(Qt::black);
- emit replyGetImage(clipId, 0, pixmap, width, height);
+ mlt_pool_release(new_image);
+ emit replyGetImage(clipId, 0, pix, width, height);
} else if (frame->get_int("test_audio") == 0) {
QPixmap pixmap(KStandardDirs::locate("appdata", "graphics/music.png"));
// Retrieve audio / video codec name
// Fetch the video_context
-#if 0 //until the reason for the chrashs is found
+#if 1
AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data(properties, "video_context", NULL);
if (context != NULL) {
// Get the video_index
int index = mlt_properties_get_int(properties, "video_index");
- if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
- filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
+
+#if ENABLE_FFMPEG_CODEC_DESCRIPTION
+ if (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 (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
+ filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
}
context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL);
if (context != NULL) {
// Get the video_index
int index = mlt_properties_get_int(properties, "audio_index");
- if (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
- filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
+
+#if ENABLE_FFMPEG_CODEC_DESCRIPTION
+ if (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 (context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
+ filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
}
#endif
-
-
// metadata
mlt_properties metadata = mlt_properties_new();
}*/
if (m_mltConsumer) {
+ m_mltConsumer->stop();
m_mltConsumer->set("refresh", 0);
} else return;
if (m_mltProducer) {
delete[] tmp;
if (!m_mltProducer || !m_mltProducer->is_valid()) kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
//m_mltProducer->optimise();
- if (position != 0) m_mltProducer->seek(position);
/*if (KdenliveSettings::osdtimecode()) {
// Attach filter for on screen display of timecode
}*/
m_fps = m_mltProducer->get_fps();
+ kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
emit durationChanged(m_mltProducer->get_playtime());
//m_connectTimer->start( 1000 );
connectPlaylist();
+ if (position != 0) {
+ m_mltProducer->seek(position);
+ emit rendererPosition(position);
+ }
m_generateScenelist = false;
}
return result;
}
-void Render::saveSceneList(QString path, QDomElement addedXml) {
+void Render::saveSceneList(QString path, QDomElement kdenliveData) {
+
char *tmppath = decodedString("westley:" + path);
Mlt::Consumer westleyConsumer(*m_mltProfile , tmppath);
delete[] tmppath;
westleyConsumer.set("terminate_on_pause", 1);
Mlt::Producer prod(m_mltProducer->get_producer());
westleyConsumer.connect(prod);
+ //prod.set("title", "kdenlive document");
+ //westleyConsumer.listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
westleyConsumer.start();
- if (!addedXml.isNull()) {
+ while (!westleyConsumer.is_stopped()) {}
+ if (!kdenliveData.isNull()) {
// add Kdenlive specific tags
QFile file(path);
QDomDocument doc;
doc.setContent(&file, false);
- doc.documentElement().appendChild(doc.importNode(addedXml, true));
+ QDomNode wes = doc.elementsByTagName("westley").at(0);
+ wes.appendChild(doc.importNode(kdenliveData, true));
file.close();
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
kWarning() << "////// ERROR writing to file: " << path;
return;
} else {
kDebug() << "----- MONITOR: " << m_name << " REFRESH";
+ m_isBlocked = false;
refresh();
}
}
return;
if (m_mltProducer->get_speed() == 0.0) m_mltProducer->set_speed(1.0);
else {
+ m_isBlocked = true;
m_mltProducer->set_speed(0.0);
- kDebug() << "// POSITON: " << m_framePosition;
+ m_mltConsumer->set("refresh", 0);
m_mltProducer->seek((int) m_framePosition);
+ m_isBlocked = false;
}
/*if (speed == 0.0) {
void Render::play(double speed) {
if (!m_mltProducer)
return;
- if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
+ // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
m_mltProducer->set_speed(speed);
/*if (speed == 0.0) {
m_mltProducer->seek((int) m_framePosition + 1);
return 0.0;
}
-const GenTime & Render::seekPosition() const {
+GenTime Render::seekPosition() const {
if (m_mltProducer) return GenTime((int) m_mltProducer->position(), m_fps);
else return GenTime();
}
void Render::emitFrameNumber(double position) {
- //kDebug()<<"// POSITON: "<<m_framePosition;
if (m_generateScenelist) return;
m_framePosition = position;
emit rendererPosition((int) position);
int height = 1080;//KdenliveSettings::defaultheight();
int width = 1940; //KdenliveSettings::displaywidth();
- QPixmap pix = KThumb::getFrame(m_mltProducer, -1, width, height);
+ //TODO: rewrite
+ QPixmap pix; // = KThumb::getFrame(m_mltProducer, -1, width, height);
/*
QPixmap pix(width, height);
Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
/** MLT PLAYLIST DIRECT MANIPULATON **/
-void Render::mltCheckLength() {
+void Render::mltCheckLength(bool reload) {
//kDebug()<<"checking track length: "<<track<<"..........";
- //reinsert main tractorin playlist so that the producer can take the new length ( not automatic done)
Mlt::Service service(m_mltProducer->get_service());
- Mlt::Playlist prod(service);
- Mlt::Service service_playlist(prod.get_clip(0)->get_service());
- Mlt::Producer producer_playlist(service_playlist);
-
- Mlt::Tractor tr(producer_playlist.parent());
- prod.remove(0);
- prod.insert(tr, 0);
-
-
- Mlt::Tractor tractor(getTractor());
+ Mlt::Tractor tractor(service);
int trackNb = tractor.count();
double duration = 0;
Mlt::Producer trackProducer(tractor.track(0));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
duration = Mlt::Producer(trackPlaylist.get_producer()).get_playtime() - 1;
- kDebug() << trackNb << " " << duration;
m_mltProducer->set("out", duration);
- emit durationChanged((int)duration);
+ emit durationChanged((int) duration);
return;
}
while (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;
+ //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;
- kDebug() << " / / /DURATON FOR TRACK 0 = " << blackDuration;
+
if (blackDuration != duration) {
blackTrackPlaylist.remove_region(0, (int)blackDuration);
int i = 0;
QDomElement black = doc.createElement("producer");
black.setAttribute("mlt_service", "colour");
black.setAttribute("colour", "black");
+ black.setAttribute("id", "black");
black.setAttribute("in", "0");
black.setAttribute("out", "13999");
- while (dur > 14000) { // <producer mlt_service=\"colour\" colour=\"black\" in=\"0\" out=\"13999\" />
+ while (dur > 14000) {
mltInsertClip(0, GenTime(i * 14000, m_fps), black);
dur = dur - 14000;
i++;
}
- black.setAttribute("out", QString::number(dur));
- mltInsertClip(0, GenTime(), black);
-
+ if (dur > 0) {
+ black.setAttribute("out", QString::number(dur));
+ mltInsertClip(0, GenTime(i * 14000, m_fps), black);
+ }
m_mltProducer->set("out", duration);
emit durationChanged((int)duration);
}
}
-mlt_tractor Render::getTractor() {
- Mlt::Service s1(m_mltProducer->get_service());
- Mlt::Playlist pl(s1);
-
- Mlt::Producer srv(pl.get_clip(0)->parent());
-
- Mlt::Tractor tractor(srv);
-
- return tractor.get_tractor();
-
-}
-
-mlt_playlist Render::getPlaylist(int track) {
- Mlt::Tractor tractor(getTractor());
- Mlt::Producer trackProducer(tractor.track(track));
- return (mlt_playlist) trackProducer.get_service();
-}
void Render::mltInsertClip(int track, GenTime position, QDomElement element) {
if (!m_mltProducer) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
- m_isBlocked = true;
- // Mlt::Service service(parentProd.get_service());
- //Mlt::Tractor tractor(service);
+
+ Mlt::Service service(parentProd.get_service());
+ Mlt::Tractor tractor(service);
+ mlt_service_lock(service.get_service());
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
QDomDocument doc;
doc.appendChild(doc.importNode(element, true));
QString resource = doc.toString();
-
- kDebug() << "/////// ADDING CLIP TMLNE: " << resource << " ON TRACK: " << track;
- Mlt::Tractor tractor(getTractor());
- Mlt::Playlist trackPlaylist(getPlaylist(track));
char *tmp = decodedString(resource);
Mlt::Producer clip(*m_mltProfile, "westley-xml", tmp);
//clip.set_in_and_out(in.frames(m_fps), out.frames(m_fps));
delete[] tmp;
-
- trackPlaylist.insert_at((int)position.frames(m_fps), clip, 1);
- tractor.multitrack()->refresh();
- tractor.refresh();
+ trackPlaylist.insert_at((int) position.frames(m_fps), clip, 1);
+ mlt_service_unlock(service.get_service());
if (track != 0) mltCheckLength();
-
- mltSavePlaylist();
- m_isBlocked = false;
+ //tractor.multitrack()->refresh();
+ //tractor.refresh();
}
void Render::mltCutClip(int track, GenTime position) {
m_isBlocked = true;
- Mlt::Playlist trackPlaylist(getPlaylist(track));
- trackPlaylist.split_at((int)position.frames(m_fps));
+
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ trackPlaylist.split_at((int) position.frames(m_fps));
trackPlaylist.consolidate_blanks(0);
- kDebug() << "/ / / /CUTTING CLIP AT: " << position.frames(m_fps);
m_isBlocked = false;
}
+void Render::mltUpdateClip(int track, GenTime position, QDomElement element) {
+ // TODO: optimize
+ mltRemoveClip(track, position);
+ mltInsertClip(track, position, element);
+}
+
void Render::mltRemoveClip(int track, GenTime position) {
m_isBlocked = true;
- Mlt::Playlist trackPlaylist(getPlaylist(track));
- int clipIndex = trackPlaylist.get_clip_index_at((int)position.frames(m_fps));
- //trackPlaylist.remove(clipIndex);
+
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
+
+ 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));
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
if (track != 0) mltCheckLength();
}
void Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) {
- Mlt::Playlist trackPlaylist(getPlaylist(track));
+
+ 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));
+ Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
if (!clip) {
kDebug() << " / / / CANNOT FIND CLIP TO REMOVE EFFECT";
return;
}
- m_isBlocked = true;
Mlt::Service clipService(clip->get_service());
-
// if (tag.startsWith("ladspa")) tag = "ladspa";
-
+ m_isBlocked = true;
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
void Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh) {
- Mlt::Playlist trackPlaylist(getPlaylist(track));
+ Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int)position.frames(m_fps));
+ Mlt::Tractor tractor(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));
if (!clip) {
kDebug() << "********** CANNOT FIND CLIP TO APPLY EFFECT-----------";
return;
m_isBlocked = true;
// create filter
QString tag = args.value("tag");
- //kDebug()<<" / / INSERTING EFFECT: "<<id;
+ kDebug() << " / / INSERTING EFFECT: " << tag;
if (tag.startsWith("ladspa")) tag = "ladspa";
- char *filterId = decodedString(tag);
- Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterId);
- if (filter && filter->is_valid())
- filter->set("kdenlive_id", filterId);
- else {
- kDebug() << "filter is NULL";
- return;
- }
-
+ char *filterTag = decodedString(tag);
+ char *filterId = decodedString(args.value("id"));
QMap<QString, QString>::Iterator it;
- QString keyFrameNumber = "#0";
-
- for (it = args.begin(); it != args.end(); ++it) {
- //kDebug()<<" / / INSERTING EFFECT ARGS: "<<it.key()<<": "<<it.data();
- QString key;
- QString currentKeyFrameNumber;
- if (it.key().startsWith("#")) {
- currentKeyFrameNumber = it.key().section(":", 0, 0);
- if (currentKeyFrameNumber != keyFrameNumber) {
- // attach filter to the clip
- clipService.attach(*filter);
- filter = new Mlt::Filter(*m_mltProfile, filterId);
- filter->set("kdenlive_id", filterId);
- keyFrameNumber = currentKeyFrameNumber;
+ QString kfr = args.value("keyframes");
+
+ if (!kfr.isEmpty()) {
+ QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts);
+ kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes");
+ char *starttag = decodedString(args.value("starttag"));
+ char *endtag = decodedString(args.value("endtag", "end"));
+ kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
+ int duration = clip->get_playtime();
+ int max = args.value("max").toInt();
+ int min = args.value("min").toInt();
+ int factor = args.value("factor", "1").toInt();
+ args.remove("starttag");
+ args.remove("endtag");
+ args.remove("keyframes");
+ for (int i = 0; i < keyFrames.size() - 1; ++i) {
+ Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ filter->set("kdenlive_id", filterId);
+ int x1 = keyFrames.at(i).section(":", 0, 0).toInt();
+ 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;
}
- key = it.key().section(":", 1);
- } else key = it.key();
- char *name = decodedString(key);
- char *value = decodedString(it.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 * (max - min) / 100.0) / factor).toUtf8().data());
+ filter->set(endtag, QString::number((min + y2 * (max - min) / 100.0) / factor).toUtf8().data());
+ clipService.attach(*filter);
+
+ }
+ delete[] starttag;
+ delete[] endtag;
+ } else {
+ Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ if (filter && filter->is_valid())
+ filter->set("kdenlive_id", filterId);
+ else {
+ kDebug() << "filter is NULL";
+ m_isBlocked = false;
+ return;
+ }
+
+ 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;
+ }
+ // attach filter to the clip
+ clipService.attach(*filter);
}
- // attach filter to the clip
- clipService.attach(*filter);
delete[] filterId;
+ delete[] filterTag;
m_isBlocked = false;
if (doRefresh) refresh();
-
}
void Render::mltEditEffect(int track, GenTime position, QMap <QString, QString> args) {
QString index = args.value("kdenlive_ix");
QString tag = args.value("tag");
QMap<QString, QString>::Iterator it = args.begin();
- if (it.key().startsWith("#") || tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
+ 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);
mltAddEffect(track, position, args);
return;
}
- m_isBlocked = true;
+
// create filter
+ Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Playlist trackPlaylist(getPlaylist(track));
+ 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));
+ Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
if (!clip) {
kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
- m_isBlocked = false;
return;
}
-
Mlt::Service clipService(clip->get_service());
-
-// if (tag.startsWith("ladspa")) tag = "ladspa";
-
+ m_isBlocked = true;
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
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);
+ }
mltAddEffect(track, position, args);
+
+ for (int i = 0; i < filtersList.count(); i++) {
+ clipService.attach(*(filtersList.at(i)));
+ }
+
m_isBlocked = false;
return;
}
refresh();
}
+void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos) {
+
+ kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
+ Mlt::Service service(m_mltProducer->parent().get_service());
+
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+ if (!clip) {
+ kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
+ return;
+ }
+ Mlt::Service clipService(clip->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 && QString(filter->get("kdenlive_ix")).toInt() == 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);
+ ct++;
+ filter = clipService.filter(ct);
+ }
+ found = true;
+ }
+ if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) {
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+ } else {
+ while (filter) {
+ if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+ filter->set("kdenlive_ix", newPos);
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+
+ ct = 0;
+ filter = clipService.filter(ct);
+ while (filter) {
+ int pos = QString(filter->get("kdenlive_ix")).toInt();
+ if (pos >= newPos) {
+ if (pos < oldPos) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 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();
+}
+
void Render::mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out) {
m_isBlocked = true;
- Mlt::Tractor tractor(getTractor());
- Mlt::Playlist trackPlaylist(getPlaylist(track));
- if (trackPlaylist.is_blank_at((int)pos.frames(m_fps) + 1))
+
+ 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());
+ if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) + 1))
kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
- int clipIndex = trackPlaylist.get_clip_index_at((int)pos.frames(m_fps) + 1);
+ int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) + 1);
int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
- int newDuration = (int)(out.frames(m_fps) - 1);
+ int newDuration = (int) out.frames(m_fps) - 1;
kDebug() << " ** RESIZING CLIP END:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", in: " << in.frames(25) << ", out: " << out.frames(25) << ", PREVIOUS duration: " << previousDuration;
- trackPlaylist.resize_clip(clipIndex, (int)in.frames(m_fps), newDuration);
+ trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), newDuration);
trackPlaylist.consolidate_blanks(0);
if (previousDuration < newDuration) {
// clip was made longer, trim next blank if there is one.
}
void Render::mltChangeTrackState(int track, bool mute, bool blind) {
-
- Mlt::Tractor tractor(getTractor());
+ 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());
if (mute) {
void Render::mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out) {
m_isBlocked = true;
- int moveFrame = (int)((moveEnd - moveStart).frames(m_fps));
+ Mlt::Service service(m_mltProducer->parent().get_service());
- Mlt::Tractor tractor(getTractor());
+ int moveFrame = (int)(moveEnd - moveStart).frames(m_fps);
+
+ Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- if (trackPlaylist.is_blank_at((int)pos.frames(m_fps) - 1))
+ if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) - 1))
kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
- int clipIndex = trackPlaylist.get_clip_index_at((int)pos.frames(m_fps) - 1);
+ int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) - 1);
kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25);
- trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), (int)out.frames(m_fps));
+ trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), (int) out.frames(m_fps));
if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
else {
int midpos = (int)moveStart.frames(m_fps) - 1; //+ (moveFrame / 2)
kDebug() << " + resizing blank: " << blankIndex << ", Mid: " << midpos << ", Length: " << blankLength << ", SIZE DIFF: " << moveFrame;
-
if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex);
else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1);
}
trackPlaylist.consolidate_blanks(0);
m_isBlocked = false;
- kDebug() << "-----------------\n" << "CLIP 0: " << trackPlaylist.clip_start(0) << ", LENGT: " << trackPlaylist.clip_length(0);
- kDebug() << "CLIP 1: " << trackPlaylist.clip_start(1) << ", LENGT: " << trackPlaylist.clip_length(1);
- kDebug() << "CLIP 2: " << trackPlaylist.clip_start(2) << ", LENGT: " << trackPlaylist.clip_length(2);
- kDebug() << "CLIP 3: " << trackPlaylist.clip_start(3) << ", LENGT: " << trackPlaylist.clip_length(3);
- kDebug() << "CLIP 4: " << trackPlaylist.clip_start(4) << ", LENGT: " << trackPlaylist.clip_length(4);
}
void Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) {
void Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) {
m_isBlocked = true;
- //m_mltConsumer->set("refresh", 0);
- Mlt::Tractor tractor(getTractor());
+
+ 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::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(startTrack));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
- mlt_field field = mlt_tractor_field(tractor.get_tractor());
- mlt_multitrack multitrack = mlt_field_multitrack(field); //mlt_tractor_multitrack(tractor.get_tractor());
- kDebug() << " -- CURRENT MULTIOTRACK HAS: " << mlt_multitrack_count(multitrack) << " tracks";;
- mlt_service multiprod = mlt_multitrack_service(multitrack);
-
- Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
- trackPlaylist.consolidate_blanks(0);
- mlt_events_block(MLT_PRODUCER_PROPERTIES(trackProducer.get_producer()), NULL);
if (endTrack == startTrack) {
+ //mlt_service_lock(service.get_service());
+ Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
+ trackPlaylist.consolidate_blanks(0);
if (!trackPlaylist.is_blank_at(moveEnd)) {
kWarning() << "// ERROR, CLIP COLLISION----------";
int ix = trackPlaylist.get_clip_index_at(moveEnd);
}
trackPlaylist.insert_at(moveEnd, clipProducer, 1);
trackPlaylist.consolidate_blanks(0);
+ //mlt_service_unlock(service.get_service());
} else {
+ Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
trackPlaylist.consolidate_blanks(0);
+
Mlt::Producer destTrackProducer(tractor.track(endTrack));
Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
destTrackPlaylist.consolidate_blanks(1);
destTrackPlaylist.insert_at(moveEnd, clipProducer, 1);
destTrackPlaylist.consolidate_blanks(0);
}
-
mltCheckLength();
- mlt_events_unblock(MLT_PRODUCER_PROPERTIES(trackProducer.get_producer()), NULL);
+ mlt_service_unlock(m_mltConsumer->get_service());
m_isBlocked = false;
m_mltConsumer->set("refresh", 1);
}
-void Render::mltMoveTransition(QString type, int startTrack, int trackOffset, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
- m_isBlocked = true;
+void Render::mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut) {
+
+ 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);
- mlt_service serv = m_mltProducer->parent().get_service();
+ m_isBlocked = true;
+ 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");
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 new_out = (int)newOut.frames(m_fps);
+
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);
- kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack;
- //kDebug()<<"// LOOKING FOR IN: "<<old_in<<", OUT: "<<old_out;
- kDebug() << "// OLD IN: " << oldIn.frames(m_fps) << " // OLD OUT: " << oldOut.frames(m_fps) << ", TRACK: " << startTrack << ", MID POS: " << old_pos;
+
if (resource == type && startTrack == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
mlt_transition_set_in_and_out(tr, new_in, new_out);
- if (trackOffset != 0) {
+ 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", mlt_transition_get_a_track(tr) + trackOffset);
- mlt_properties_set_int(properties, "b_track", mlt_transition_get_b_track(tr) + trackOffset);
+ 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);
}
break;
}
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");
}
m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
}
-void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args) {
- kDebug() << "update transition" << tag;
-
- mltDeleteTransition(oldTag, a_track, b_track, in, out, args);
- mltAddTransition(tag, a_track, b_track, in, out, args);
+void Render::mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml) {
+ //kDebug() << "update transition" << tag;
+ if (oldTag == tag) 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);
+ }
mltSavePlaylist();
}
-void Render::replaceTimelineTractor(Mlt::Tractor t) {
- Mlt::Service service(m_mltProducer->get_service());
- Mlt::Playlist prod(service);
- Mlt::Service service_playlist(prod.get_clip(0)->get_service());
- prod.remove(0);
- prod.insert(t, 0);
- kDebug() << "newTractor inserted";
-}
-
-void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args) {
-
- Mlt::Tractor tractor(getTractor());
-
- Mlt::Tractor newTractor;
- mlt_service service = tractor.get_service();
- mlt_service nextservice = mlt_service_get_producer(service);
- int old_position = m_mltProducer->position();
- for (int track = 0;track < 10;track++) {
- Mlt::Producer *trackprod = tractor.track(track);
- if (!trackprod)
- continue;
- newTractor.multitrack()->connect(*trackprod, track);
- }
- for (int i = 2;i <= 5;i++) {
- Mlt::Transition tr(*m_mltProfile, "mix");
- tr.set("combine", 1);
- tr.set("internal_added", 237);
- tr.set_in_and_out(0, 15000);
- newTractor.plant_transition(tr, 1, i);
+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();
+
+ 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 mlt_type = mlt_properties_get(properties, "mlt_type");
+ QString resource = mlt_properties_get(properties, "mlt_service");
+ int in_pos = (int) in.frames(m_fps);
+ int out_pos = (int) out.frames(m_fps);
+
+ 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);
+
+ // 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);
+
+ 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;
+ //filter->set("kdenlive_id", id);
+ delete[] name;
+ delete[] value;
+ }
+ break;
+ }
+ nextservice = mlt_service_producer(nextservice);
+ if (nextservice == NULL) break;
+ properties = MLT_SERVICE_PROPERTIES(nextservice);
+ mlt_type = mlt_properties_get(properties, "mlt_type");
+ resource = mlt_properties_get(properties, "mlt_service");
}
- while (nextservice != NULL) {
- mlt_properties prop = MLT_SERVICE_PROPERTIES(nextservice);
- //kDebug() << mlt_properties_get(prop, "mlt_type") << mlt_properties_get(prop, "id");
- if (QString(mlt_properties_get(prop, "mlt_type")) == "transition" && QString(mlt_properties_get(prop, "internal_added")) != "237") {
-
- mlt_transition tr = (mlt_transition) nextservice;
- Mlt::Transition transition(tr);
- int current_a_track = mlt_transition_get_a_track(tr);
- int current_b_track = mlt_transition_get_b_track(tr);
- int currentIn = (int) mlt_transition_get_in(tr);
- int currentOut = (int) mlt_transition_get_out(tr);
- int old_pos = (int)((in.frames(m_fps) + out.frames(m_fps)) / 2);
- //kDebug() << current_a_track << current_b_track << a_track << b_track << currentIn << currentOut << old_pos << mlt_properties_get(prop,"mlt_service");
- if (current_a_track == a_track && b_track == current_b_track && currentIn <= old_pos && currentOut >= old_pos) {
- //kDebug() << "removing " << mlt_properties_get(prop,"mlt_service");
- } else
- newTractor.plant_transition(transition, current_a_track, current_b_track);
+ m_isBlocked = false;
+ 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());
+ Mlt::Tractor tractor(service);
+ Mlt::Field *field = tractor.field();
+
+ 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 mlt_type = mlt_properties_get(properties, "mlt_type");
+ QString resource = mlt_properties_get(properties, "mlt_service");
+ int old_pos = (int)((in + out).frames(m_fps) / 2);
+
+ 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);
+ kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack;
+
+ if (resource == tag && b_track == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
+ mlt_field_disconnect_service(field->get_field(), nextservice);
+ break;
}
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");
}
+ m_mltConsumer->set("refresh", 1);
+}
- replaceTimelineTractor(newTractor);
- m_mltProducer->seek(old_position);
- refresh();
+QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
+ QDomNodeList attribs = xml.elementsByTagName("parameter");
+ QMap<QString, QString> map;
+ 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");
+ map[name] = e.attribute("default");
+ if (!e.attribute("value").isEmpty()) {
+ map[name] = e.attribute("value");
+ }
+ if (!e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
+ map[name] = QString::number(map[name].toDouble() / e.attribute("factor").toDouble());
+ //map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
+ }
+ 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]"));
+ QString neu;
+ QTextStream txtNeu(&neu);
+ if (values.size() > 0)
+ txtNeu << (int)values[0].toDouble();
+ int i = 0;
+ for (i = 0;i < separators.size() && i + 1 < values.size();i++) {
+ txtNeu << separators[i];
+ txtNeu << (int)(values[i+1].toDouble());
+ }
+ if (i < separators.size())
+ txtNeu << separators[i];
+ map[e.attribute("name")] = neu;
+ }
+
+ }
+ return map;
}
-void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QMap <QString, QString> args) {
+void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool do_refresh) {
+ //kDebug() << "-- ADDING TRANSITION: " << tag << ", ON TRACKS: " << a_track << ", " << b_track;
+ QMap<QString, QString> args = mltGetTransitionParamsFromXml(xml);
- m_isBlocked = true;
- Mlt::Tractor tractor(getTractor());
+
+ Mlt::Service service(m_mltProducer->parent().get_service());
+
+ Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
+
char *transId = decodedString(tag);
- Mlt::Transition transition(*m_mltProfile, transId);
- if (!transition.get_transition()) {
- kDebug() << "NO transition is " << transition.get_transition() << "requested was " << tag << a_track << b_track << in.frames(m_fps) << out.frames(m_fps);
- return;
- }
- transition.set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps));
+ Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId);
+ transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps));
QMap<QString, QString>::Iterator it;
QString key;
key = it.key();
char *name = decodedString(key);
char *value = decodedString(it.value());
- transition.set(name, value);
+ transition->set(name, value);
kDebug() << " ------ ADDING TRANS PARAM: " << name << ": " << value;
//filter->set("kdenlive_id", id);
delete[] name;
delete[] value;
}
// attach filter to the clip
- field->plant_transition(transition, a_track, b_track);
+ field->plant_transition(*transition, a_track, b_track);
delete[] transId;
- m_isBlocked = false;
refresh();
}
void Render::mltSavePlaylist() {
kWarning() << "// UPDATING PLAYLIST TO DISK++++++++++++++++";
- Mlt::Consumer *fileConsumer = new Mlt::Consumer(*m_mltProfile, "westley");
- fileConsumer->set("resource", "/tmp/playlist.westley");
+ Mlt::Consumer fileConsumer(*m_mltProfile, "westley");
+ fileConsumer.set("resource", "/tmp/playlist.westley");
Mlt::Service service(m_mltProducer->get_service());
- fileConsumer->connect(service);
- fileConsumer->start();
+ fileConsumer.connect(service);
+ fileConsumer.start();
}
projects / kdenlive / blobdiff