m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
+ m_mltConsumer->set("window_background", decodedString(KdenliveSettings::window_background().name()));
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltConsumer->set("rescale", "nearest");
}
}
-void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer) {
int height = 50;
int width = (int)(height * m_mltProfile->dar());
QMap < QString, QString > filePropertyMap;
KUrl url = KUrl(xml.attribute("resource", QString::null));
Mlt::Producer *producer = NULL;
if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
return;
}
if (xml.attribute("type").toInt() == COLOR) {
metadataPropertyMap[ name.section(".", 0, -2)] = value;
}
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap);
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
kDebug() << "REquested fuile info for: " << url.path();
if (frame) delete frame;
//if (producer) delete producer;
}
/** Create the producer from the Westley QDomDocument */
-QString Render::sceneList() {
+const QString Render::sceneList() {
QString playlist;
Mlt::Consumer westleyConsumer(*m_mltProfile , "westley:kdenlive_playlist");
m_mltProducer->optimise();
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;
+ //kDebug() << "Changing clip speed, set in and out: " << info.cropStart.frames(m_fps) << " to " << (info.endPos - info.startPos).frames(m_fps) - 1;
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(info.track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipLength = trackPlaylist.clip_length(clipIndex);
Mlt::Producer clip(trackPlaylist.get_clip(clipIndex));
- QString serv = clip.parent().get("mlt_service");
- QString id = clip.parent().get("id");
- kDebug() << "CLIP SERVICE: " << clip.parent().get("mlt_service");
+ if (!clip.is_valid() || clip.is_blank()) {
+ // invalid clip
+ return -1;
+ }
+ Mlt::Producer clipparent = clip.parent();
+ if (!clipparent.is_valid() || clipparent.is_blank()) {
+ // invalid clip
+ return -1;
+ }
+ QString serv = clipparent.get("mlt_service");
+ QString id = clipparent.get("id");
+ //kDebug() << "CLIP SERVICE: " << serv;
if (serv == "avformat" && speed != 1.0) {
mlt_service_lock(service.get_service());
- QString url = clip.parent().get("resource");
+ QString url = clipparent.get("resource");
url.append("?" + QString::number(speed));
Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
if (!slowprod || slowprod->get_producer() == NULL) {
} else if (serv == "framebuffer") {
mlt_service_lock(service.get_service());
- QString url = clip.parent().get("resource");
+ QString url = clipparent.get("resource");
url = url.section("?", 0, 0);
url.append("?" + QString::number(speed));
Mlt::Producer *slowprod = m_slowmotionProducers.value(url);
Mlt::Producer *cut;
if (clipIndex + 1 < trackPlaylist.count() && (info.startPos + newDuration).frames(m_fps) > blankEnd) {
GenTime maxLength = GenTime(blankEnd, m_fps) - info.startPos;
- cut = slowprod->cut((int)(info.cropStart.frames(m_fps)), (int)(info.cropStart.frames(m_fps) + maxLength.frames(m_fps) - 1));
+ cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)(info.cropStart.frames(m_fps) / speed + maxLength.frames(m_fps) - 1));
} else cut = slowprod->cut((int)(info.cropStart.frames(m_fps) / speed), (int)((info.cropStart / speed + newDuration).frames(m_fps) - 1));
trackPlaylist.insert_at(startPos, *cut, 1);
int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
int newDuration = (int) clipDuration.frames(m_fps) - 1;
trackPlaylist.resize_clip(clipIndex, previousStart, newDuration + previousStart);
- //trackPlaylist.consolidate_blanks(0);
+ trackPlaylist.consolidate_blanks(0);
// skip to next clip
clipIndex++;
int diff = newDuration - previousDuration;
- kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration;
+ kDebug() << "//////// RESIZE CLIP: " << clipIndex << "( pos: " << info.startPos.frames(25) << "), DIFF: " << diff << ", CURRENT DUR: " << previousDuration << ", NEW DUR: " << newDuration << ", IX: " << clipIndex << ", MAX: " << trackPlaylist.count();
if (diff > 0) {
// clip was made longer, trim next blank if there is one.
- if (trackPlaylist.is_blank(clipIndex)) {
- int blankStart = trackPlaylist.clip_start(clipIndex);
- int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
- if (diff - blankDuration == 1) {
- trackPlaylist.remove(clipIndex);
- } else trackPlaylist.resize_clip(clipIndex, blankStart, blankStart + blankDuration - diff);
- } else {
- kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex;
+ if (clipIndex < trackPlaylist.count()) {
+ // If this is not the last clip in playlist
+ if (trackPlaylist.is_blank(clipIndex)) {
+ int blankStart = trackPlaylist.clip_start(clipIndex);
+ int blankDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ if (diff > blankDuration) kDebug() << "// ERROR blank clip is not large enough to get back required space!!!";
+ if (diff - blankDuration == 1) {
+ trackPlaylist.remove(clipIndex);
+ } else trackPlaylist.remove_region(blankStart, diff - 1);
+ } else {
+ kDebug() << "/// RESIZE ERROR, NXT CLIP IS NOT BLK: " << clipIndex;
+ }
}
} else trackPlaylist.insert_blank(clipIndex, 0 - diff - 1);
refresh();
}
+
+bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff) {
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ int frameOffset = (int) diff.frames(m_fps);
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(info.track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ if (trackPlaylist.is_blank_at(info.startPos.frames(m_fps))) {
+ kDebug() << "//////// ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
+ return false;
+ }
+ mlt_service_lock(service.get_service());
+ int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
+ if (clip == NULL) {
+ kDebug() << "//////// ERROR RSIZING NULL CLIP!!!!!!!!!!!";
+ mlt_service_unlock(service.get_service());
+ return false;
+ }
+ int previousStart = clip->get_in();
+ int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
+ m_isBlocked = true;
+ trackPlaylist.resize_clip(clipIndex, previousStart + frameOffset, previousStart + previousDuration + frameOffset);
+ m_isBlocked = false;
+ mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
+ return true;
+}
+
bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
//kDebug() << "//////// RSIZING CLIP from: "<<info.startPos.frames(25)<<" to "<<diff.frames(25);
Mlt::Service service(m_mltProducer->parent().get_service());
}
mlt_service_lock(service.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
- /*int previousStart = trackPlaylist.clip_start(clipIndex);
- int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/
- //kDebug() << " ** RESIZING CLIP START:" << clipIndex << " on track:" << track << ", mid pos: " << pos.frames(25) << ", moving: " << moveFrame << ", in: " << in.frames(25) << ", out: " << out.frames(25);
Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
if (clip == NULL) {
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;
void Render::mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod) {
+ if (prod == NULL || !prod->is_valid()) {
+ kDebug() << "// Warning, CLIP on track " << track << ", at: " << pos << " is invalid, cannot update it!!!";
+ return;
+ }
kDebug() << "NEW PROD ID: " << prod->get("id");
m_mltConsumer->set("refresh", 0);
kDebug() << "// TRYING TO UPDATE CLIP at: " << pos << ", TK: " << track;
}
tractor.removeChild(track);
setSceneList(doc.toString(), m_framePosition);
+ mltCheckLength();
return;
blockSignals(true);