#include <avformat.h>
}
+#include <stdlib.h>
+
#include <QTimer>
#include <QDir>
#include <QApplication>
#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->m_isBlocked) return;
}
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(-1), m_framePosition(0), m_generateScenelist(false), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false) {
- kDebug() << "////////// USING PROFILE: " << (char *)KdenliveSettings::current_profile().toUtf8().data();
- m_mltProfile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
+ kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
refreshTimer = new QTimer(this);
connect(refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
m_osdProfile = KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
- //if (rendererName == "clip")
- {
- //Mlt::Consumer *consumer = new Mlt::Consumer( profile , "sdl_preview");
- m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview"); //consumer;
- 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);
- Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", "<westley><playlist><producer mlt_service=\"colour\" colour=\"blue\" in=\"0\" out=\"25\" /></playlist></westley>");
- m_mltProducer = producer;
- if (m_blackClip) delete m_blackClip;
- m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
- m_blackClip->set("id", "black");
- m_mltConsumer->connect(*m_mltProducer);
- m_mltProducer->set_speed(0.0);
+ buildConsumer();
- //m_mltConsumer->start();
- //refresh();
- //initSceneList();
- }
- /*m_osdInfo = new Mlt::Filter("data_show");
- char *tmp = decodedString(m_osdProfile);
- m_osdInfo->set("resource", tmp);
- delete[] tmp;*/
- // Does it do anything usefull? I mean, RenderThread doesn't do anything useful at the moment
- // (except being cpu hungry :)
-
- /* if(!s_renderThread) {
- s_renderThread = new RenderThread;
- s_renderThread->start();
- } */
+ m_externalwinid = extid;
+ m_winid = winid;
+ 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_mltConsumer->connect(*m_mltProducer);
+ m_mltProducer->set_speed(0.0);
}
Render::~Render() {
}
+void Render::buildConsumer() {
+ char *tmp;
+ tmp = decodedString(KdenliveSettings::current_profile());
+ m_mltProfile = new Mlt::Profile(tmp);
+ delete[] tmp;
+
+
+ QString videoDriver = KdenliveSettings::videodrivername();
+ if (!videoDriver.isEmpty()) {
+ if (videoDriver == "x11_noaccel") {
+ setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1);
+ videoDriver = "x11";
+ } else {
+ unsetenv("SDL_VIDEO_YUV_HWACCEL");
+ }
+ }
+
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
+ m_mltConsumer->set("resize", 1);
+ 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");
+
+ QString audioDevice = KdenliveSettings::audiodevicename();
+ if (!audioDevice.isEmpty()) {
+ tmp = decodedString(audioDevice);
+ m_mltConsumer->set("audio_device", tmp);
+ delete[] tmp;
+ }
+
+ if (!videoDriver.isEmpty()) {
+ tmp = decodedString(videoDriver);
+ m_mltConsumer->set("video_driver", tmp);
+ delete[] tmp;
+ }
+
+ QString audioDriver = KdenliveSettings::audiodrivername();
+ if (!audioDriver.isEmpty()) {
+ tmp = decodedString(audioDriver);
+ m_mltConsumer->set("audio_driver", tmp);
+ delete[] tmp;
+ }
-int Render::resetProfile(QString profile) {
+ m_mltConsumer->set("progressive", 1);
+ m_mltConsumer->set("audio_buffer", 1024);
+ m_mltConsumer->set("frequency", 48000);
+}
+
+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;
+ }
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;
m_mltProducer = NULL;
if (m_mltProfile) delete m_mltProfile;
m_mltProfile = NULL;
-
- 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("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);
+ buildConsumer();
kDebug() << "//RESET WITHSCENE: " << scene;
setSceneList(scene);
- tmp = decodedString(scene);
+ char *tmp = decodedString(scene);
Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
delete[] tmp;
m_mltProducer = producer;
//mlt_properties_set(properties, "profile", "hdv_1080_50i");
//m_mltConsumer->set("profile", (char *) profile.toUtf8().data());
//m_mltProfile = new Mlt::Profile((char*) profile.toUtf8().data());
- kDebug() << " ++++++++++ RESET CONSUMER WITH PROFILE: " << profile << ", WIDTH: " << m_mltProfile->width();
//apply_profile_properties( m_mltProfile, m_mltConsumer->get_consumer(), properties );
//refresh();
pix.fill(Qt::black);
return pix;
}
- return KThumb::getFrame(*m_mltProducer, frame_position, width, height);
+ return KThumb::getFrame(m_mltProducer, frame_position, width, height);
}
QPixmap Render::getImageThumbnail(KUrl url, int width, int height) {
}
}
-void Render::getFileProperties(const QDomElement &xml, int clipId) {
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
int height = 50;
int width = (int)(height * m_mltProfile->dar());
QMap < QString, QString > filePropertyMap;
emit removeInvalidClip(clipId);
return;
}
- producer->set("id", clipId);
+ char *tmp = decodedString(clipId);
+ producer->set("id", tmp);
+ delete[] tmp;
int frameNumber = xml.attribute("thumbnail", "0").toInt();
if (frameNumber != 0) producer->seek(frameNumber);
mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer());
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: ";
- m_mltProducer->optimise();
m_fps = m_mltProducer->get_fps();
connectPlaylist();
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::emitFrameNumber(double position) {
- if (m_generateScenelist) return;
+ //if (m_generateScenelist) return;
m_framePosition = position;
emit rendererPosition((int) position);
//if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
Mlt::Producer *clip = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
- trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1);
+ int newIndex = trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *clip, 1);
if (QString(prod->get("transparency")).toInt() == 1)
mltAddClipTransparency(info, info.track - 1, QString(prod->get("id")).toInt());
mlt_service_unlock(service.get_service());
- if (info.track != 0) mltCheckLength();
+ if (info.track != 0 && (newIndex + 1 == trackPlaylist.count())) mltCheckLength();
//tractor.multitrack()->refresh();
//tractor.refresh();
}
void Render::mltCutClip(int track, GenTime position) {
+
m_isBlocked = true;
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());
- trackPlaylist.split_at((int) position.frames(m_fps));
- trackPlaylist.consolidate_blanks(0);
+
+
+ /* // Display playlist info
+ kDebug()<<"//////////// BEFORE";
+ 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;
+ }*/
+
+ int cutPos = (int) position.frames(m_fps);
+
+ int clipIndex = trackPlaylist.get_clip_index_at(cutPos);
+ if (trackPlaylist.is_blank(clipIndex)) {
+ kDebug() << "// WARMNING, TRYING TO CUT A BLANK";
+ m_isBlocked = false;
+ return;
+ }
+ mlt_service_lock(service.get_service());
+ int clipStart = trackPlaylist.clip_start(clipIndex);
+ trackPlaylist.split(clipIndex, cutPos - clipStart - 1);
+
// duplicate effects
- Mlt::Producer *original = trackPlaylist.get_clip_at((int) position.frames(m_fps) - 1);
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps) + 1);
+ Mlt::Producer *original = trackPlaylist.get_clip_at(clipStart);
+ Mlt::Producer *clip = trackPlaylist.get_clip_at(cutPos);
+
+ if (original == NULL || clip == NULL) {
+ kDebug() << "// ERROR GRABBING CLIP AFTER SPLIT";
+ }
Mlt::Service clipService(original->get_service());
Mlt::Service dupService(clip->get_service());
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- Mlt::Filter *dup = new Mlt::Filter(filter->get_filter());
- dupService.attach(*dup);
+ if (filter->get("kdenlive_id") != "") {
+ kDebug() << "++ ADDING FILTER: " << filter->get("kdenlive_id");
+ Mlt::Filter *dup = new Mlt::Filter(filter->get_filter());
+ dup->set("kdenlive_ix", filter->get("kdenlive_ix"));
+ dup->set("kdenlive_id", filter->get("kdenlive_id"));
+ dupService.attach(*dup);
+ }
ct++;
filter = clipService.filter(ct);
}
+ mlt_service_unlock(service.get_service());
+
+ /* // Display playlist info
+ kDebug()<<"//////////// AFTER";
+ 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;
+ }*/
+
+ m_isBlocked = false;
}
void Render::mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod) {
}
-void Render::mltRemoveClip(int track, GenTime position) {
- m_isBlocked = true;
-
+bool Render::mltRemoveClip(int track, GenTime position) {
Mlt::Service service(m_mltProducer->parent().get_service());
if (service.type() != tractor_type) kWarning() << "// TRACTOR PROBLEM";
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++) {
+ 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;
+ }*/
+
+ if (trackPlaylist.is_blank(clipIndex)) {
+ kDebug() << "// WARMNING, TRYING TO REMOVE A BLANK: " << clipIndex << ", AT: " << position.frames(25);
+ return false;
+ }
+ m_isBlocked = true;
Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
- if (QString(clip.parent().get("transparency")).toInt() == 1)
- mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
- if (track != 0) mltCheckLength();
- //emit durationChanged();
+ if (QString(clip.parent().get("transparency")).toInt() == 1)
+ mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());
+
+ /* // Display playlist info
+ kDebug()<<"//// AFTER";
+ 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;
+ }*/
+
+ if (track != 0 && trackPlaylist.count() > clipIndex) mltCheckLength();
m_isBlocked = false;
+ return true;
}
int Render::mltChangeClipSpeed(ItemInfo info, double speed, Mlt::Producer *prod) {
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;
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (serv == "avformat" && speed != 1.0) {
mlt_service_lock(service.get_service());
QString url = clip.parent().get("resource");
- url.append(":" + QString::number(speed));
- char *tmp = decodedString(url);
- Mlt::Producer *slow = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
- delete[] tmp;
- tmp = decodedString(id);
- slow->set("id", tmp);
- delete[] tmp;
- slow->set_in_and_out(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps));
- newLength = slow->get_length();
+ url.append("?" + QString::number(speed));
+ Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+ if (!slowprod || slowprod->get_producer() == NULL) {
+ char *tmp = decodedString(url);
+ slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+ delete[] tmp;
+ QString producerid = "slowmotion:" + id + ":" + QString::number(speed);
+ tmp = decodedString(producerid);
+ slowprod->set("id", tmp);
+ delete[] tmp;
+ m_slowmotionProducers.insert(url, slowprod);
+ }
+ Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
+ newLength = cut->get_length();
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
- trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *slow, 1);
+ trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1);
mlt_service_unlock(service.get_service());
- kDebug() << "AVFORMAT CLIP!!!:";
} else if (speed == 1.0) {
mlt_service_lock(service.get_service());
Mlt::Producer *cut = prod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
} else if (serv == "framebuffer") {
mlt_service_lock(service.get_service());
QString url = clip.parent().get("resource");
- url = url.section(":", 0, -1);
- url.append(":" + QString::number(speed));
- char *tmp = decodedString(url);
- Mlt::Producer *slow = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
- delete[] tmp;
- tmp = decodedString(id);
- slow->set("id", tmp);
- delete[] tmp;
- slow->set_in_and_out(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps));
- newLength = slow->get_length();
+ url = url.section("?", 0, 0);
+ url.append("?" + QString::number(speed));
+ Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
+ if (!slowprod || slowprod->get_producer() == NULL) {
+ char *tmp = decodedString(url);
+ slowprod = new Mlt::Producer(*m_mltProfile, "framebuffer", tmp);
+ delete[] tmp;
+ QString producerid = "slowmotion:" + id.section(":", 1, 1) + ":" + QString::number(speed);
+ tmp = decodedString(producerid);
+ slowprod->set("id", tmp);
+ delete[] tmp;
+ m_slowmotionProducers.insert(url, slowprod);
+ }
+ Mlt::Producer *cut = slowprod->cut(info.cropStart.frames(m_fps), (info.endPos - info.startPos).frames(m_fps) - 1);
+ newLength = cut->get_length();
trackPlaylist.replace_with_blank(clipIndex);
trackPlaylist.consolidate_blanks(0);
- trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *slow, 1);
+ trackPlaylist.insert_at((int) info.startPos.frames(m_fps), *cut, 1);
mlt_service_unlock(service.get_service());
kDebug() << "AVFORMAT CLIP!!!:";
}
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (index == "-1" || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
+ if ((index == "-1" && filter->get("kdenlive_id") != "") || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
if (clipService.detach(*filter) == 0) success = true;
kDebug() << " / / / DLEETED EFFECT: " << ct;
} else ct++;
}
-bool Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, QHash <QString, QString> args, bool doRefresh) {
Mlt::Service service(m_mltProducer->parent().get_service());
if (tag.startsWith("ladspa")) tag = "ladspa";
char *filterTag = decodedString(tag);
char *filterId = decodedString(args.value("id"));
- QMap<QString, QString>::Iterator it;
+ QHash<QString, QString>::Iterator it;
QString kfr = args.value("keyframes");
if (!kfr.isEmpty()) {
return true;
}
-bool Render::mltEditEffect(int track, GenTime position, QMap <QString, QString> args) {
+bool Render::mltEditEffect(int track, GenTime position, QHash <QString, QString> args) {
QString index = args.value("kdenlive_ix");
QString tag = args.value("tag");
- QMap<QString, QString>::Iterator it = args.begin();
+ 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);
refresh();
}
-void Render::mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out) {
+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(track));
+ Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- if (trackPlaylist.is_blank_at((int) pos.frames(m_fps) + 1))
+
+ /* // Display playlist info
+ kDebug()<<"//////////// BEFORE RESIZE";
+ 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;
+ }*/
+
+ if (trackPlaylist.is_blank_at((int) info.startPos.frames(m_fps))) {
kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
- int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) + 1);
+ m_isBlocked = false;
+ return false;
+ }
+ int clipIndex = trackPlaylist.get_clip_index_at((int) info.startPos.frames(m_fps));
+ kDebug() << "// SELECTED CLIP START: " << trackPlaylist.clip_start(clipIndex);
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
- int previousStart = trackPlaylist.clip_start(clipIndex);
+ int previousStart = clip->get_in();
int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
- int newDuration = (int) out.frames(m_fps) - 1;
- trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), newDuration);
- trackPlaylist.consolidate_blanks(0);
- if (previousDuration < newDuration) {
+ int newDuration = (int) clipDuration.frames(m_fps) - 1;
+ trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
+ //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;
+ if (diff > 0) {
// clip was made longer, trim next blank if there is one.
- if (trackPlaylist.is_blank(clipIndex + 1)) {
- trackPlaylist.split(clipIndex + 1, newDuration - previousDuration);
- trackPlaylist.remove(clipIndex + 1);
+ 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;
}
- } else trackPlaylist.insert_blank(clipIndex + 1, previousDuration - newDuration - 1);
+ } else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
trackPlaylist.consolidate_blanks(0);
+ /* // Display playlist info
+ kDebug()<<"//////////// AFTER RESIZE";
+ 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;
+ }*/
+
//tractor.multitrack()->refresh();
//tractor.refresh();
- if (track != 0) mltCheckLength();
+ if (info.track != 0 && clipIndex == trackPlaylist.count()) mltCheckLength();
if (QString(clip->parent().get("transparency")).toInt() == 1) {
//mltResizeTransparency(previousStart, previousStart, previousStart + newDuration, track, QString(clip->parent().get("id")).toInt());
- mltDeleteTransparency(previousStart, track, QString(clip->parent().get("id")).toInt());
- ItemInfo info;
- info.startPos = pos;
- info.endPos = pos + out - in;
- info.track = track;
- mltAddClipTransparency(info, info.track - 1, QString(clip->parent().get("id")).toInt());
+ mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt());
+ ItemInfo transpinfo;
+ transpinfo.startPos = info.startPos;
+ transpinfo.endPos = info.startPos + clipDuration;
+ transpinfo.track = info.track;
+ mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
}
m_isBlocked = false;
+ return true;
}
void Render::mltChangeTrackState(int track, bool mute, bool blind) {
refresh();
}
-void Render::mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out) {
- m_isBlocked = 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)(moveEnd - moveStart).frames(m_fps);
-
+ int moveFrame = (int) diff.frames(m_fps);
Mlt::Tractor tractor(service);
- Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Producer trackProducer(tractor.track(info.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(info.startPos.frames(m_fps))) {
kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
- int clipIndex = trackPlaylist.get_clip_index_at((int) pos.frames(m_fps) - 1);
- int previousStart = trackPlaylist.clip_start(clipIndex);
+ return false;
+ }
+ 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);
- trackPlaylist.resize_clip(clipIndex, (int) in.frames(m_fps), (int) out.frames(m_fps));
+ if (clip == NULL) {
+ 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;
+ m_isBlocked = true;
+ kDebug() << "RESIZE, old start: " << previousStart << ", PREV DUR: " << previousDuration << ", DIFF: " << moveFrame;
+ trackPlaylist.resize_clip(clipIndex, previousStart + moveFrame, previousStart + previousDuration);
if (moveFrame > 0) trackPlaylist.insert_blank(clipIndex, moveFrame - 1);
else {
- int midpos = (int)moveStart.frames(m_fps) - 1; //+ (moveFrame / 2)
- int blankIndex = trackPlaylist.get_clip_index_at(midpos);
+ //int midpos = info.startPos.frames(m_fps) + moveFrame - 1;
+ int blankIndex = clipIndex - 1;
int blankLength = trackPlaylist.clip_length(blankIndex);
-
- kDebug() << " + resizing blank: " << blankIndex << ", Mid: " << midpos << ", 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";
+ }
if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex);
else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1);
}
trackPlaylist.consolidate_blanks(0);
if (QString(clip->parent().get("transparency")).toInt() == 1) {
//mltResizeTransparency(previousStart, (int) moveEnd.frames(m_fps), (int) (moveEnd + out - in).frames(m_fps), track, QString(clip->parent().get("id")).toInt());
- mltDeleteTransparency(previousStart, track, QString(clip->parent().get("id")).toInt());
- ItemInfo info;
- info.startPos = moveEnd;
- info.endPos = moveEnd + out - in;
- info.track = track;
- mltAddClipTransparency(info, info.track - 1, QString(clip->parent().get("id")).toInt());
+ mltDeleteTransparency(info.startPos.frames(m_fps), info.track, QString(clip->parent().get("id")).toInt());
+ ItemInfo transpinfo;
+ transpinfo.startPos = info.startPos + diff;
+ transpinfo.endPos = info.startPos + diff + (info.endPos - info.startPos);
+ transpinfo.track = info.track;
+ mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
}
m_isBlocked = false;
+ //m_mltConsumer->set("refresh", 1);
+ mlt_service_unlock(service.get_service());
+ return true;
}
bool Render::mltMoveClip(int startTrack, int endTrack, GenTime moveStart, GenTime moveEnd) {
Mlt::Producer trackProducer(tractor.track(startTrack));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
+ 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));
- trackPlaylist.consolidate_blanks(0);
if (!trackPlaylist.is_blank_at(moveEnd)) {
// error, destination is not empty
m_isBlocked = false;
return false;
} else {
- trackPlaylist.insert_at(moveEnd, clipProducer, 1);
trackPlaylist.consolidate_blanks(0);
+ int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt());
}
+ if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
}
//mlt_service_unlock(service.get_service());
} else {
Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex));
trackPlaylist.consolidate_blanks(0);
destTrackPlaylist.consolidate_blanks(1);
- destTrackPlaylist.insert_at(moveEnd, clipProducer, 1);
+ int newIndex = destTrackPlaylist.insert_at(moveEnd, clipProducer, 1);
destTrackPlaylist.consolidate_blanks(0);
if (QString(clipProducer.parent().get("transparency")).toInt() == 1) {
kDebug() << "//////// moving clip transparency";
mltMoveTransparency(moveStart, moveEnd, startTrack, endTrack, QString(clipProducer.parent().get("id")).toInt());
}
+ if (clipIndex > trackPlaylist.count()) checkLength = true;
+ else if (newIndex + 1 == destTrackPlaylist.count()) checkLength = true;
}
}
- mltCheckLength();
+
+ if (checkLength) mltCheckLength();
mlt_service_unlock(m_mltConsumer->get_service());
m_isBlocked = false;
m_mltConsumer->set("refresh", 1);
projects / kdenlive / blobdiff