}
}
+ if (effect.attribute("id") == "crop") {
+ // default use_profile to 1 for clips with proxies to avoid problems when rendering
+ if (e.attribute("name") == "use_profile" && !(m_clip->getProperty("proxy").isEmpty() || m_clip->getProperty("proxy") == "-"))
+ e.setAttribute("value", "1");
+ }
+
if ((e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("keyframes").isEmpty()) {
// Effect has a keyframe type parameter, we need to set the values
e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default"));
continue;
if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
effectPositions << i;
- updateGeometryKeyframes(effect, j, width, height, cut);
+// updateGeometryKeyframes(effect, j, width, height, cut);
}
}
}
return m_clip->producer(trackSpecific ? track : -1);
}
-QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height, int previous, int current, bool fromStart)
+QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo)
{
QMap<int, QDomElement> effects;
for (int i = 0; i < m_effectList.count(); i++) {
setFadeOut(out - in);
}
continue;
- } else if (fromStart && effect.attribute("id") == "freeze") {
+ } else if (effect.attribute("id") == "freeze" && cropStart() != oldInfo.cropStart) {
effects[i] = effect.cloneNode().toElement();
- int diff = previous - current;
+ int diff = (oldInfo.cropStart - cropStart()).frames(m_fps);
int frame = EffectsList::parameter(effect, "frame").toInt();
EffectsList::setParameter(effect, "frame", QString::number(frame - diff));
continue;
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();
- updateNormalKeyframes(param, previous, current, fromStart);
+ updateNormalKeyframes(param);
#ifdef QJSON
} else if (type == "roto-spline") {
if (!effects.contains(i))
return effects;
}
-bool ClipItem::updateNormalKeyframes(QDomElement parameter, const int previous, const int current, bool fromStart)
+bool ClipItem::updateNormalKeyframes(QDomElement parameter)
{
- // TODO: add interpolated keyframes at clip in/out point
+ int in = cropStart().frames(m_fps);
+ int out = (cropStart() + cropDuration()).frames(m_fps) - 1;
- bool modified = false;
+ const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts);
+ QMap <int, double> keyframes;
+ foreach (QString keyframe, data)
+ keyframes[keyframe.section(':', 0, 0).toInt()] = keyframe.section(':', 1, 1).toDouble();
- // parse keyframes and adjust values
- const QStringList keyframes = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts);
- QMap <int, double> kfr;
- int pos;
- double val;
- foreach(const QString &str, keyframes) {
- pos = str.section(':', 0, 0).toInt();
- val = str.section(':', 1, 1).toDouble();
- if (pos == previous) {
- // first or last keyframe
- kfr[current] = val;
- modified = true;
- } else {
- if ((fromStart && pos >= current) || (!fromStart && pos <= current)) {
- // only keyframes in range
- kfr[pos] = val;
- modified = true;
+
+ QMap<int, double>::iterator i = keyframes.end();
+ int lastPos = -1;
+ double lastValue = 0;
+ qreal relPos;
+
+ /*
+ * Take care of resize from start
+ */
+ bool startFound = false;
+ while (i-- != keyframes.begin()) {
+ if (i.key() < in && !startFound) {
+ startFound = true;
+ if (lastPos < 0) {
+ keyframes[in] = i.value();
+ } else {
+ relPos = (in - i.key()) / (qreal)(lastPos - i.key() + 1);
+ keyframes[in] = i.value() + (lastValue - i.value()) * relPos;
}
}
+ lastPos = i.key();
+ lastValue = i.value();
+ if (startFound)
+ i = keyframes.erase(i);
+ }
+
+ /*
+ * Take care of resize from end
+ */
+ i = keyframes.begin();
+ lastPos = -1;
+ bool endFound = false;
+ while (i != keyframes.end()) {
+ if (i.key() > out && !endFound) {
+ endFound = true;
+ if (lastPos < 0) {
+ keyframes[out] = i.value();
+ } else {
+ relPos = (out - lastPos) / (qreal)(i.key() - lastPos + 1);
+ keyframes[out] = lastValue + (i.value() - lastValue) * relPos;
+ }
+ }
+ lastPos = i.key();
+ lastValue = i.value();
+ if (endFound)
+ i = keyframes.erase(i);
+ else
+ ++i;
}
- if (modified) {
+ if (startFound || endFound) {
QString newkfr;
- QMap<int, double>::const_iterator k = kfr.constBegin();
- while (k != kfr.constEnd()) {
- newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';');
+ QMap<int, double>::const_iterator k = keyframes.constBegin();
+ while (k != keyframes.constEnd()) {
+ newkfr.append(QString::number(k.key()) + ':' + QString::number(qRound(k.value())) + ';');
++k;
}
parameter.setAttribute("keyframes", newkfr);
+ return true;
}
- return modified;
+ 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"
projects / kdenlive / blobdiff