copyright : (C) Marco Gittler
email : g.marco@freenet.de
copyright : (C) 2006 Jean-Baptiste Mardelle
- email : jb@ader.ch
+ email : jb@kdenlive.org
***************************************************************************/
#include "renderer.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
-//#include <ffmpeg/avformat.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 {
refreshTimer = new QTimer(this);
connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
- m_connectTimer = new QTimer(this);
- connect(m_connectTimer, SIGNAL(timeout()), this, SLOT(connectPlaylist()));
-
if (rendererName == "project") m_monitorId = 10000;
else m_monitorId = 10001;
osdTimer = new QTimer(this);
void Render::closeMlt() {
- delete m_connectTimer;
delete osdTimer;
delete refreshTimer;
if (m_mltConsumer)
int Render::resetProfile(QString profile) {
+
+
if (!m_mltConsumer) return 0;
if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
- m_mltConsumer->set("refresh", 0);
m_mltConsumer->purge();
delete m_mltConsumer;
+
m_mltConsumer = NULL;
QString scene = sceneList();
if (m_mltProducer) delete m_mltProducer;
if (m_mltProfile) delete m_mltProfile;
m_mltProfile = NULL;
- m_mltProfile = new Mlt::Profile((char*) profile.toUtf8().data());
+ char *tmp = decodedString(profile);
+ m_mltProfile = new Mlt::Profile(tmp);
+ delete[] tmp;
m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); //consumer;
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
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());
+ kDebug() << "//RESET WITHSCENE: " << scene;
+ setSceneList(scene);
+
+ tmp = decodedString(scene);
+ Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
+ delete[] tmp;
m_mltProducer = producer;
- m_mltConsumer->connect(*m_mltProducer);
- m_mltProducer->set_speed(0.0);
+ m_mltProducer->set_speed(0);
+ connectPlaylist();
//delete m_mltProfile;
// mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer());
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);
- /*Mlt::Filter m_convert(*m_mltProfile, "avcolour_space");
- m_convert.set("forced", mlt_image_rgb24a);
- mlt_producer->attach(m_convert);
- Mlt::Frame *frame = mlt_producer->get_frame();
-
- if (frame) {
- pix = frameThumbnail(frame, width, height);
- delete frame;
- } else pix.fill(Qt::black);
- delete mlt_producer;
- return pix;*/
+ return KThumb::getFrame(*m_mltProducer, frame_position, width, height);
}
QPixmap Render::getImageThumbnail(KUrl url, int width, int height) {
return true;
}
+const double Render::dar() const {
+ return m_mltProfile->dar();
+}
+
void Render::getFileProperties(const QDomElement &xml, int clipId) {
- int height = 40;
+ int height = 50;
int width = (int)(height * m_mltProfile->dar());
- QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
- doc.appendChild(westley);
- westley.appendChild(doc.importNode(xml, true));
- //kDebug() << "////////////\n" << doc.toString() << "////////////////\n";
- char *tmp = decodedString(doc.toString());
+ QMap < QString, QString > filePropertyMap;
+ QMap < QString, QString > metadataPropertyMap;
- Mlt::Producer producer(*m_mltProfile, "westley-xml", tmp);
- delete[] tmp;
+ KUrl url = KUrl(xml.attribute("resource", QString::null));
+
+ Mlt::Producer *producer;
- if (producer.is_blank()) {
+ if (url.isEmpty()) {
+ QDomDocument doc;
+ QDomElement westley = doc.createElement("westley");
+ QDomElement play = doc.createElement("playlist");
+ doc.appendChild(westley);
+ westley.appendChild(play);
+ play.appendChild(doc.importNode(xml, true));
+ char *tmp = decodedString(doc.toString());
+ producer = new Mlt::Producer(*m_mltProfile, "westley-xml", tmp);
+ delete[] tmp;
+ } else {
+ char *tmp = decodedString(url.path());
+ producer = new Mlt::Producer(*m_mltProfile, tmp);
+ delete[] tmp;
+ }
+
+ if (producer->is_blank()) {
+ kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: ";
return;
}
- 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;
+ int frameNumber = xml.attribute("thumbnail", "0").toInt();
+ if (frameNumber != 0) producer->seek(frameNumber);
+ mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer());
- 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();
+ filePropertyMap["duration"] = QString::number(producer->get_playtime());
+ //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
- //filePropertyMap["fps"] = QString::number(mlt_producer_get_fps(producer.get_producer()));
- filePropertyMap["fps"] = producer.get("source_fps");
+ Mlt::Frame * frame = producer->get_frame();
+ 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"));
if (frame->get_int("test_image") == 0) {
if (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(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer->get_service()), "title"));
} else if (frame->get_int("test_audio") == 0)
filePropertyMap["type"] = "av";
else
filePropertyMap["type"] = "video";
- // Generate thumbnail for this frame
- QPixmap pixmap = KThumb::getFrame(&producer, 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);
- emit replyGetImage(clipId, 0, pixmap, 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);
+
+ 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"));
// Fetch the video_context
#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;
+ }
+ } else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL);
if (context != NULL) {
- // Get the video_index
+ // Get the audio_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
emit replyGetFileProperties(clipId, filePropertyMap, metadataPropertyMap);
kDebug() << "REquested fuile info for: " << url.path();
if (frame) delete frame;
+ if (producer) delete producer;
}
/** Create the producer from the Westley QDomDocument */
if (m_winid == -1) return;
m_generateScenelist = true;
- //kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
+ kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
/*
if (m_mltConsumer) {
m_mltConsumer->stop();
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
} else return;
+
if (m_mltProducer) {
- m_mltProducer->set_speed(0.0);
+ m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
delete 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();
- emit durationChanged(m_mltProducer->get_playtime());
- //m_connectTimer->start( 1000 );
+ kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
connectPlaylist();
+ if (position != 0) {
+ m_mltProducer->seek(position);
+ emit rendererPosition(position);
+ }
m_generateScenelist = false;
}
void Render::connectPlaylist() {
if (!m_mltConsumer) return;
- m_connectTimer->stop();
- m_mltConsumer->set("refresh", "0");
+ //m_mltConsumer->set("refresh", "0");
m_mltConsumer->connect(*m_mltProducer);
- m_mltProducer->set_speed(0.0);
+ m_mltProducer->set_speed(0);
m_mltConsumer->start();
- refresh();
+ emit durationChanged(m_mltProducer->get_playtime());
+ //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."));
void Render::refreshDisplay() {
if (!m_mltProducer) return;
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
mlt_properties properties = MLT_PRODUCER_PROPERTIES(m_mltProducer->get_producer());
/*if (KdenliveSettings::osdtimecode()) {
return;
} else {
kDebug() << "----- MONITOR: " << m_name << " REFRESH";
+ m_isBlocked = false;
refresh();
}
}
}
void Render::clear() {
+ kDebug() << " ********* RENDER CLEAR";
if (m_mltConsumer) {
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
}
void Render::stop() {
if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
kDebug() << "///////////// RENDER STOPPED: " << m_name;
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
m_mltConsumer->stop();
}
kDebug() << "///////////// RENDER STOP2-------";
}
void Render::stop(const GenTime & startTime) {
+
kDebug() << "///////////// RENDER STOP-------2";
if (m_mltProducer) {
m_mltProducer->set_speed(0.0);
void Render::switchPlay() {
if (!m_mltProducer)
return;
- if (m_mltProducer->get_speed() == 0.0) m_mltProducer->set_speed(1.0);
- else {
+ if (m_mltProducer->get_speed() == 0.0) {
+ m_isBlocked = false;
+ m_mltProducer->set_speed(1.0);
+ m_mltConsumer->set("refresh", 1);
+ kDebug() << " ********* RENDER PLAY: " << m_mltProducer->get_speed();
+ } else {
+ //m_isBlocked = true;
+ m_mltConsumer->set("refresh", 0);
m_mltProducer->set_speed(0.0);
- kDebug() << "// POSITON: " << m_framePosition;
+ m_isBlocked = true;
m_mltProducer->seek((int) m_framePosition);
+ //kDebug()<<" ********* RENDER PAUSE: "<<m_mltProducer->get_speed();
+ //m_mltConsumer->set("refresh", 0);
+ /*mlt_position position = mlt_producer_position( m_mltProducer->get_producer() );
+ m_mltProducer->set_speed(0);
+ m_mltProducer->seek( position );
+ //m_mltProducer->seek((int) m_framePosition);
+ m_isBlocked = false;*/
}
-
/*if (speed == 0.0) {
m_mltProducer->seek((int) m_framePosition + 1);
m_mltConsumer->purge();
}*/
- refresh();
+ //refresh();
}
void Render::play(double speed) {
+ kDebug() << " ********* REDNER PLAY";
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);
void Render::sendSeekCommand(GenTime time) {
+ //kDebug()<<" ********* RENDER SEND SEEK";
if (!m_mltProducer)
return;
//kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps));
m_mltProducer->seek((int)(time.frames(m_fps)));
+ m_mltConsumer->set("refresh", 1);
refresh();
}
void Render::seekToFrame(int pos) {
+ //kDebug()<<" ********* RENDER SEEK TO POS";
if (!m_mltProducer)
return;
//kDebug()<<"////////// KDENLIVE SEEK: "<<(int) (time.frames(m_fps));
void Render::doRefresh() {
// Use a Timer so that we don't refresh too much
- refresh();
+ m_mltConsumer->set("refresh", 1);
}
void Render::refresh() {
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 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\" />
- mltInsertClip(0, GenTime(i * 14000, m_fps), black);
+ while (dur > 14000) {
+ mltInsertClip(0, GenTime(i * 14000, m_fps), GenTime(), 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), GenTime(), black);
+ }
m_mltProducer->set("out", duration);
emit durationChanged((int)duration);
}
}
-void Render::mltInsertClip(int track, GenTime position, QDomElement element) {
+void Render::mltInsertClip(int track, GenTime position, GenTime crop, QDomElement element) {
if (!m_mltProducer) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
return;
kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
+
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());
QString resource = doc.toString();
char *tmp = decodedString(resource);
Mlt::Producer clip(*m_mltProfile, "westley-xml", tmp);
+ clip.set("in", crop.frames(m_fps));
//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);
+ mlt_service_unlock(service.get_service());
if (track != 0) mltCheckLength();
- tractor.multitrack()->refresh();
- tractor.refresh();
+ //tractor.multitrack()->refresh();
+ //tractor.refresh();
}
void Render::mltCutClip(int track, GenTime position) {
m_isBlocked = false;
}
-void Render::mltUpdateClip(int track, GenTime position, QDomElement element) {
+void Render::mltUpdateClip(int track, GenTime position, GenTime crop, QDomElement element) {
// TODO: optimize
mltRemoveClip(track, position);
- mltInsertClip(track, position, element);
+ mltInsertClip(track, position, crop, element);
}
m_isBlocked = false;
}
-void Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) {
+bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh) {
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::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
if (!clip) {
kDebug() << " / / / CANNOT FIND CLIP TO REMOVE EFFECT";
- return;
+ return success;
}
Mlt::Service clipService(clip->get_service());
// if (tag.startsWith("ladspa")) tag = "ladspa";
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
if (index == "-1" || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
- clipService.detach(*filter);
+ if (clipService.detach(*filter) == 0) success = true;
kDebug() << " / / / DLEETED EFFECT: " << ct;
} else ct++;
filter = clipService.filter(ct);
}
m_isBlocked = false;
if (doRefresh) refresh();
+ return success;
}
-void Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh) {
Mlt::Service service(m_mltProducer->parent().get_service());
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;
+ return false;
}
Mlt::Service clipService(clip->get_service());
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";
- m_isBlocked = false;
- 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", "start"));
+ char *endtag = decodedString(args.value("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");
+ int offset = 0;
+ 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() + 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;
}
- 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) / 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())
+ filter->set("kdenlive_id", filterId);
+ else {
+ kDebug() << "filter is NULL";
+ m_isBlocked = false;
+ return false;
+ }
+
+ 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();
+ return true;
}
-void Render::mltEditEffect(int track, GenTime position, QMap <QString, QString> args) {
+bool 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;
+ bool success = mltAddEffect(track, position, args);
+ return success;
}
// create filter
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;
+ return false;
}
Mlt::Service clipService(clip->get_service());
m_isBlocked = true;
filter = clipService.filter(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 (filter->get("kdenlive_ix") > index) {
- 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)));
- }
+ // 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)));
+ }
m_isBlocked = false;
- return;
+ return success;
}
for (it = args.begin(); it != args.end(); ++it) {
}
m_isBlocked = false;
refresh();
+ return true;
+}
+
+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 = false;
}
-void Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) {
- mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps));
+bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) {
+ return mltMoveClip(startTrack, endTrack, (int) moveStart.frames(m_fps), (int) moveEnd.frames(m_fps));
}
-void Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) {
+bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEnd) {
m_isBlocked = true;
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::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
- Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
- trackPlaylist.consolidate_blanks(0);
- //mlt_events_block( MLT_PRODUCER_PROPERTIES(clipProducer.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);
- kDebug() << "BAD CLIP STARTS AT: " << trackPlaylist.clip_start(ix) << ", LENGT: " << trackPlaylist.clip_length(ix);
+ // error, destination is not empty
+ //int ix = trackPlaylist.get_clip_index_at(moveEnd);
+ mlt_service_unlock(m_mltConsumer->get_service());
+ m_isBlocked = false;
+ return false;
+ } else {
+ trackPlaylist.insert_at(moveEnd, clipProducer, 1);
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.insert_at(moveEnd, clipProducer, 1);
- trackPlaylist.consolidate_blanks(0);
+ //mlt_service_unlock(service.get_service());
} else {
- 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);
+ if (!destTrackPlaylist.is_blank_at(moveEnd)) {
+ // error, destination is not empty
+ mlt_service_unlock(m_mltConsumer->get_service());
+ m_isBlocked = false;
+ return false;
+ } else {
+ Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
+ trackPlaylist.consolidate_blanks(0);
+ destTrackPlaylist.consolidate_blanks(1);
+ destTrackPlaylist.insert_at(moveEnd, clipProducer, 1);
+ destTrackPlaylist.consolidate_blanks(0);
+ }
}
-
mltCheckLength();
+ mlt_service_unlock(m_mltConsumer->get_service());
m_isBlocked = false;
m_mltConsumer->set("refresh", 1);
- //mlt_events_unblock( MLT_PRODUCER_PROPERTIES(clipProducer.get_producer()), NULL );
+ return true;
}
-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;
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, QDomElement xml) {
- //kDebug() << "update transition" << tag;
+ // kDebug() << "update transition" << tag << " at pos " << in.frames(25);
if (oldTag == tag) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
else {
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
- m_mltConsumer->set("refresh", 0);
+ //m_mltConsumer->set("refresh", 0);
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
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;
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");
}
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);
+ if (do_refresh) m_mltConsumer->set("refresh", 0);
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
kDebug() << "// FOUND EXISTING TRANS, IN: " << currentIn << ", OUT: " << currentOut << ", TRACK: " << currentTrack;
if (resource == tag && b_track == currentTrack && currentIn <= old_pos && currentOut >= old_pos) {
+ //kDebug() << " / / / / /DELETE TRANS DOOOMNE";
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);
+ if (do_refresh) m_mltConsumer->set("refresh", 1);
}
QMap<QString, QString> Render::mltGetTransitionParamsFromXml(QDomElement xml) {
}
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);
projects / kdenlive / blobdiff