}
}
}
- if (fade > 0) m_startFade = fade;
- else if (fade < 0) m_endFade = -fade;
+ if (fade > 0)
+ m_startFade = fade;
+ else if (fade < 0)
+ m_endFade = -fade;
}
setSelectedEffect(0);
}
}
if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
- int end = (cropDuration() + cropStart()).frames(m_fps);
+ int end = (cropDuration() + cropStart()).frames(m_fps) - 1;
int start = end;
if (effect.attribute("id") == "fadeout") {
if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
bool ClipItem::checkKeyFrames()
{
bool clipEffectsModified = false;
- for (int ix = 0; ix < m_effectList.count(); ix ++) {
- QString kfr = keyframes(ix);
- if (!kfr.isEmpty()) {
+ // go through all effects this clip has
+ for (int ix = 0; ix < m_effectList.count(); ++ix) {
+ QStringList keyframeParams = keyframes(ix);
+ QStringList newKeyFrameParams;
+ bool effModified = false;
+
+ // go through all params which have keyframes
+ foreach(const QString &kfr, keyframeParams) {
const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts);
QStringList newKeyFrames;
bool cutKeyFrame = false;
double lastValue = -1;
int start = cropStart().frames(m_fps);
int end = (cropStart() + cropDuration()).frames(m_fps);
+
+ // go through all keyframes for one param
foreach(const QString &str, keyframes) {
int pos = str.section(':', 0, 0).toInt();
double val = str.section(':', 1, 1).toDouble();
lastPos = pos;
lastValue = val;
}
- if (modified) {
- // update KeyFrames
- setKeyframes(ix, newKeyFrames.join(";"));
- clipEffectsModified = true;
- }
+
+ newKeyFrameParams.append(newKeyFrames.join(";"));
+ if (modified)
+ effModified = true;
+ }
+
+ if (effModified) {
+ // update KeyFrames
+ setKeyframes(ix, newKeyFrameParams);
+ clipEffectsModified = true;
}
}
return clipEffectsModified;
}
-void ClipItem::setKeyframes(const int ix, const QString keyframes)
+void ClipItem::setKeyframes(const int ix, const QStringList keyframes)
{
QDomElement effect = getEffectAt(ix);
if (effect.attribute("disable") == "1") return;
QDomNodeList params = effect.elementsByTagName("parameter");
+ int keyframeParams = 0;
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
- e.setAttribute("keyframes", keyframes);
- if (ix == m_selectedEffect) {
+ e.setAttribute("keyframes", keyframes.at(keyframeParams));
+ if (ix == m_selectedEffect && keyframeParams == 0) {
m_keyframes.clear();
double max = e.attribute("max").toDouble();
double min = e.attribute("min").toDouble();
if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
update();
- return;
}
- break;
+ ++keyframeParams;
}
}
}
}
}
-QString ClipItem::keyframes(const int index)
+QStringList ClipItem::keyframes(const int index)
{
- QString result;
+ QStringList result;
QDomElement effect = effectAt(index);
QDomNodeList params = effect.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
- if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
- result = e.attribute("keyframes");
- break;
- }
+ if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe"))
+ result.append(e.attribute("keyframes"));
}
return result;
}
if (m_info.cropStart > m_maxDuration) {
m_info.cropStart = GenTime();
m_info.cropDuration = qMin(m_info.cropDuration, m_maxDuration);
- updateRectGeometry();
} else {
m_info.cropDuration = m_maxDuration;
- updateRectGeometry();
}
+ updateRectGeometry();
}
}
}
QDomElement ClipItem::xml() const
{
- QDomElement xml = m_clip->toXML();
- if (m_speed != 1.0) xml.setAttribute("speed", m_speed);
- if (m_strobe > 1) xml.setAttribute("strobe", m_strobe);
- if (m_audioOnly) xml.setAttribute("audio_only", 1);
- else if (m_videoOnly) xml.setAttribute("video_only", 1);
- return xml;
+ return itemXml();
}
QDomElement ClipItem::itemXml() const
GenTime pos;
for (int i = 0; i < markers.size(); i++) {
-
pos = GenTime((int)(markers.at(i).frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart();
if (pos > GenTime()) {
if (pos > cropDuration()) break;
}
*/
-void ClipItem::resizeStart(int posx, bool)
+void ClipItem::resizeStart(int posx, bool /*size*/)
{
bool sizeLimit = false;
if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) {
bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart)
{
- bool modified = false;
+ bool effModified = false;
for (int i = 0; i < m_effectList.count(); i++) {
QDomElement effect = m_effectList.at(i);
QDomNodeList params = effect.elementsByTagName("parameter");
for (int j = 0; j < params.count(); j++) {
- QDomElement e = params.item(i).toElement();
- if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
+ bool modified = false;
+ QDomElement e = params.item(j).toElement();
+ if (e.isNull())
+ continue;
+ if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") {
// parse keyframes and adjust values
const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
QMap <int, double> kfr;
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;
}
}
}
if (modified) {
+ effModified = true;
QString newkfr;
QMap<int, double>::const_iterator k = kfr.constBegin();
while (k != kfr.constEnd()) {
++k;
}
e.setAttribute("keyframes", newkfr);
- break;
}
}
}
}
- if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
- return modified;
+ if (effModified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
+ return effModified;
}
//virtual
if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable"));
-
QString effectId = effect.attribute("id");
if (effectId.isEmpty()) effectId = effect.attribute("tag");
parameters.addParam("id", effectId);
+ // special case: the affine effect needs in / out points
+ if (effectId == "pan_zoom") {
+ int start = cropStart().frames(m_fps);
+ int end = (cropStart() + cropDuration()).frames(m_fps);
+ if (start < 0) {
+ end -= start;
+ start = 0;
+ }
+ parameters.addParam("in", QString::number(start));
+ parameters.addParam("out", QString::number(end));
+ }
+
QDomNodeList params = effect.elementsByTagName("parameter");
int fade = 0;
for (int i = 0; i < params.count(); i++) {
double factor = e.attribute("factor", "1").toDouble();
if (factor != 1) {
for (int j = 0; j < values.count(); j++) {
- QString pos = values.at(j).section(":", 0, 0);
- double val = values.at(j).section(":", 1, 1).toDouble() / factor;
+ QString pos = values.at(j).section(':', 0, 0);
+ double val = values.at(j).section(':', 1, 1).toDouble() / factor;
values[j] = pos + "=" + QString::number(val);
}
}
return parameters;
}
-EffectsParameterList ClipItem::getEffectArgs(const QDomElement effect)
-{
- EffectsParameterList parameters;
- parameters.addParam("tag", effect.attribute("tag"));
- parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix"));
- parameters.addParam("id", effect.attribute("id"));
- if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
- if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable"));
-
- QDomNodeList params = effect.elementsByTagName("parameter");
- for (int i = 0; i < params.count(); i++) {
- QDomElement e = params.item(i).toElement();
- //kDebug() << "/ / / /SENDING EFFECT PARAM: " << e.attribute("type") << ", NAME_ " << e.attribute("tag");
- if (e.attribute("type") == "simplekeyframe") {
-
- QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
- double factor = e.attribute("factor", "1").toDouble();
- for (int j = 0; j < values.count(); j++) {
- QString pos = values.at(j).section(":", 0, 0);
- double val = values.at(j).section(":", 1, 1).toDouble() / factor;
- values[j] = pos + "=" + QString::number(val);
- }
- // kDebug() << "/ / / /SENDING KEYFR:" << values;
- parameters.addParam(e.attribute("name"), values.join(";"));
- /*parameters.addParam(e.attribute("name"), e.attribute("keyframes").replace(":", "="));
- parameters.addParam("max", e.attribute("max"));
- parameters.addParam("min", e.attribute("min"));
- parameters.addParam("factor", e.attribute("factor", "1"));*/
- } else if (e.attribute("type") == "keyframe") {
- kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE";
- parameters.addParam("keyframes", e.attribute("keyframes"));
- parameters.addParam("max", e.attribute("max"));
- parameters.addParam("min", e.attribute("min"));
- parameters.addParam("factor", e.attribute("factor", "1"));
- parameters.addParam("starttag", e.attribute("starttag", "start"));
- parameters.addParam("endtag", e.attribute("endtag", "end"));
- } else if (e.attribute("namedesc").contains(';')) {
- QString format = e.attribute("format");
- QStringList separators = format.split("%d", QString::SkipEmptyParts);
- QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
- QString neu;
- QTextStream txtNeu(&neu);
- if (values.size() > 0)
- txtNeu << (int)values[0].toDouble();
- for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) {
- txtNeu << separators[i];
- txtNeu << (int)(values[i+1].toDouble());
- }
- parameters.addParam("start", neu);
- } else {
- if (e.attribute("factor", "1") != "1") {
- double fact;
- if (e.attribute("factor").startsWith('%')) {
- fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor"));
- } else fact = e.attribute("factor", "1").toDouble();
- parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact));
- } else {
- parameters.addParam(e.attribute("name"), e.attribute("value"));
- }
- }
- }
- return parameters;
-}
-
void ClipItem::deleteEffect(QString index)
{
bool needRepaint = false;
}
}
+QList <int> ClipItem::updatePanZoom(int width, int height, int cut)
+{
+ QList <int> effectPositions;
+ for (int i = 0; i < m_effectList.count(); i++) {
+ QDomElement effect = m_effectList.at(i);
+ QDomNodeList params = effect.elementsByTagName("parameter");
+ for (int j = 0; j < params.count(); j++) {
+ QDomElement e = params.item(j).toElement();
+ if (e.isNull())
+ continue;
+ if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
+ effectPositions << i;
+
+ int in = cropStart().frames(fps());
+ int out = in + cropDuration().frames(fps());
+ if (in < 0) {
+ out -= in;
+ in = 0;
+ }
+ int dur = out - in - 1;
+
+ effect.setAttribute("in", in);
+ effect.setAttribute("out", out);
+
+ Mlt::Geometry geometry(e.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(e.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);
+ }
+
+ }
+
+ e.setAttribute("value", geometry.serialise());
+ }
+ }
+ }
+
+ return effectPositions;
+}
#include "clipitem.moc"
projects / kdenlive / blobdiff