Commit 715c1fea authored by Till Theato's avatar Till Theato
Browse files

- Fix effect update upon clip duration change

- Use Geometry.serialise with in and out point to update "Pan and Zoom"
- small cleanup

svn path=/trunk/kdenlive/; revision=5541
parent da1ee40c
......@@ -1731,7 +1731,7 @@ QList <int> ClipItem::updatePanZoom(int width, int height, int cut)
continue;
if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
effectPositions << i;
updateGeometryKeyframes(effect, j, width, height, cut);
// updateGeometryKeyframes(effect, j, width, height, cut);
}
}
}
......@@ -1810,7 +1810,7 @@ QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height,
if (type == "geometry" && !param.hasAttribute("fixed")) {
if (!effects.contains(i))
effects[i] = effect.cloneNode().toElement();
updateGeometryKeyframes(effect, j, width, height, 0);
updateGeometryKeyframes(effect, j, width, height, oldInfo);
} else if (type == "simplekeyframe" || type == "keyframe") {
if (!effects.contains(i))
effects[i] = effect.cloneNode().toElement();
......@@ -1903,64 +1903,13 @@ bool ClipItem::updateNormalKeyframes(QDomElement parameter)
return false;
}
void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, int cut)
void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo)
{
// TODO: properly update when clip resized from start
QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement();
int in = cropStart().frames(fps());
int out = in + cropDuration().frames(fps());
int dur = out - in - 1;
effect.setAttribute("in", in);
effect.setAttribute("out", out);
Mlt::Geometry geometry(param.attribute("value").toUtf8().data(), dur, width, height);
Mlt::GeometryItem item;
bool endFrameAdded = false;
if (cut == 0) {
while (!geometry.next_key(&item, dur)) {
if (!endFrameAdded) {
// add keyframe at the end with interpolated value
// but only once ;)
endFrameAdded = true;
Mlt::GeometryItem endItem;
Mlt::GeometryItem interp;
geometry.fetch(&interp, dur - 1);
endItem.frame(dur - 1);
endItem.x(interp.x());
endItem.y(interp.y());
endItem.w(interp.w());
endItem.h(interp.h());
endItem.mix(interp.mix());
geometry.insert(&endItem);
}
geometry.remove(item.frame());
}
} else {
Mlt::Geometry origGeometry(param.attribute("value").toUtf8().data(), dur, width, height);
// remove keyframes before cut point
while (!geometry.prev_key(&item, cut - 1) && item.frame() < cut)
geometry.remove(item.frame());
// add a keyframe at new pos 0
origGeometry.fetch(&item, cut);
item.frame(0);
geometry.insert(&item);
// move exisiting keyframes by -cut
while (!origGeometry.next_key(&item, cut)) {
geometry.remove(item.frame());
origGeometry.remove(item.frame());
item.frame(item.frame() - cut);
geometry.insert(&item);
}
}
Mlt::Geometry geometry(param.attribute("value").toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height);
param.setAttribute("value", geometry.serialise());
param.setAttribute("value", geometry.serialise(cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1));
}
#include "clipitem.moc"
......@@ -167,7 +167,7 @@ public:
*
* Can be used for all effects using mlt_geometry with keyframes, but at the moment Pan & Zoom is the only one. */
QList <int> updatePanZoom(int width, int height, int cut = 0);
void updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, int cut = 0);
void updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo);
bool updateNormalKeyframes(QDomElement parameter);
/** @brief Adjusts effects after a clip duration change. */
......
......@@ -6663,8 +6663,7 @@ void CustomTrackView::slotRefreshThumbs(const QString &id, bool resetThumbs)
void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoCommand* command)
{
QMap<int, QDomElement> effects;
item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo);
QMap<int, QDomElement> effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo);
if (effects.count()) {
QMap<int, QDomElement>::const_iterator i = effects.constBegin();
......
......@@ -2631,10 +2631,12 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
// This is a keyframe effect, to edit it, we remove it and re-add it.
bool success = mltRemoveEffect(track, position, index, false);
if (!success) kDebug() << "// ERROR Removing effect : " << index;
if (position < GenTime()) success = mltAddTrackEffect(track, params);
else success = mltAddEffect(track, position, params);
if (!success) kDebug() << "// ERROR Adding effect : " << index;
// if (!success) kDebug() << "// ERROR Removing effect : " << index;
if (position < GenTime())
success = mltAddTrackEffect(track, params);
else
success = mltAddEffect(track, position, params);
// if (!success) kDebug() << "// ERROR Adding effect : " << index;
return success;
}
if (position < GenTime()) {
......@@ -2653,33 +2655,22 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
return false;
}
Mlt::Service clipService(clip->get_service());
int duration = clip->get_playtime();
bool doRefresh = true;
// Check if clip is visible in monitor
int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
if (diff < 0 || diff > duration) doRefresh = false;
delete clip;
if (diff < 0 || diff > duration)
doRefresh = false;
m_isBlocked = true;
int ct = 0;
/* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
while (filter) {
kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
ct++;
filter = clipService.filter(ct);
}
kDebug() << "++++++++++++++++++++++++++";
ct = 0;
filter = clipService.filter(ct); */
Mlt::Filter *filter = clipService.filter(ct);
Mlt::Filter *filter = clip->filter(ct);
while (filter) {
if (filter->get_int("kdenlive_ix") == index.toInt()) {
break;
}
ct++;
filter = clipService.filter(ct);
filter = clip->filter(ct);
}
if (!filter) {
......@@ -2698,11 +2689,10 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
}
// Pan and Zoom will be updated upon clip duration change
if (params.paramValue("id") == "pan_zoom") {
filter->set_in_and_out(service.get_int("in"), service.get_int("out") + 1);
}
if (params.paramValue("id") == "pan_zoom")
filter->set_in_and_out(clip->get_in(), clip->get_out() + 1);
delete clip;
mlt_service_unlock(service.get_service());
m_isBlocked = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment