From 45c50dccda9dd773958bdd13cca238334cc89466 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 16 Nov 2026 20:51:08 -0600 Subject: [PATCH] Add keyframe animation looping controls Add a loop toggle and repeated keyframe curves to the Keyframes panel. Show authored endpoint values in controls and provide an action to match the first keyframe value. Hide looping controls and guard loop APIs with older MLT versions. --- src/docks/keyframesdock.cpp | 10 + src/models/keyframesmodel.cpp | 139 +++++- src/models/keyframesmodel.h | 7 +- src/qml/views/keyframes/KeyframeParameter.qml | 465 ++++++++++-------- src/qml/views/keyframes/ParameterHead.qml | 23 + src/qml/views/keyframes/keyframes.qml | 2 + src/qmltypes/qmlfilter.cpp | 78 ++- src/qmltypes/qmlfilter.h | 3 +- 8 files changed, 503 insertions(+), 224 deletions(-) diff --git a/src/docks/keyframesdock.cpp b/src/docks/keyframesdock.cpp index 32286809df..09760345ec 100644 --- a/src/docks/keyframesdock.cpp +++ b/src/docks/keyframesdock.cpp @@ -193,6 +193,7 @@ KeyframesDock::KeyframesDock(QmlProducer *qmlProducer, QWidget *parent) keyEaseInOutMenu->addAction(Actions["keyframesTypeEaseInOutBounAction"]); m_keyTypeNextMenu->addMenu(keyEaseInOutMenu); m_keyMenu->addMenu(m_keyTypeNextMenu); + m_keyMenu->addAction(Actions["keyframesMatchFirstAction"]); m_keyMenu->addAction(Actions["keyframesRemoveAction"]); Actions.loadFromMenu(m_keyMenu); @@ -1076,6 +1077,12 @@ void KeyframesDock::setupActions() }); Actions.add("keyframesRemoveAction", action); + action = new QAction(tr("Match First Keyframe Value"), this); + connect(action, &QAction::triggered, this, [this]() { + m_model.matchFirstValue(currentParameter()); + }); + Actions.add("keyframesMatchFirstAction", action); + action = new QAction(tr("Rebuild Audio Waveform"), this); action->setEnabled(Settings.timelineShowWaveforms()); connect(action, &QAction::triggered, this, [&](bool checked) { @@ -1319,6 +1326,9 @@ void KeyframesDock::onKeyframeRightClicked() } m_keyTypePrevMenu->setEnabled(!firstKey); m_keyTypeNextMenu->setEnabled(!lastKey); + Actions["keyframesMatchFirstAction"]->setVisible( + lastKey && m_model.keyframeCount(currentParameter()) >= 2 + && m_model.data(m_model.index(currentParameter()), KeyframesModel::LoopRole).toBool()); m_keyMenu->popup(QCursor::pos()); } diff --git a/src/models/keyframesmodel.cpp b/src/models/keyframesmodel.cpp index 2658e744e1..0a904f89c2 100644 --- a/src/models/keyframesmodel.cpp +++ b/src/models/keyframesmodel.cpp @@ -28,11 +28,22 @@ static const quintptr NO_PARENT_ID = quintptr(-1); +static void notifyPropertyChanged(Mlt::Properties &properties, const QString &name) +{ + const QByteArray propertyName = name.toUtf8(); + mlt_events_fire(properties.get_properties(), + "property-changed", + mlt_event_data_from_string(propertyName.constData())); +} + /*! \qmltype KeyframesModel \inqmlmodule org.shotcut.qml \brief A two-level item model describing a filter's keyframeable parameters and their keyframes. + The read-only \c supportsLoop property indicates whether the build supports keyframe looping + (MLT 7.43.0 or newer). + \c KeyframesModel is available as the \c parameters context property in the Keyframes panel. The top level contains one row per keyframeable parameter; each parameter row contains one child row per keyframe. @@ -78,6 +89,15 @@ KeyframesModel::KeyframesModel(QObject *parent) KeyframesModel::~KeyframesModel() {} +bool KeyframesModel::supportsLoop() const +{ +#if LIBMLT_VERSION_INT >= ((7 << 16) + (43 << 8)) + return true; +#else + return false; +#endif +} + int KeyframesModel::rowCount(const QModelIndex &parent) const { if (parent.isValid()) { @@ -219,11 +239,19 @@ QVariant KeyframesModel::data(const QModelIndex &index, int role) const QString units = m_metadata->keyframes() ->parameter(m_metadataIndex[index.internalId()]) ->units(); - return QStringLiteral("%1 - %2\n%3%4") - .arg(QmlApplication::singleton().timeFromFrames(position)) - .arg(type) - .arg(value) - .arg(units); + QString description = QStringLiteral("%1 - %2\n%3%4") + .arg(QmlApplication::singleton().timeFromFrames( + position)) + .arg(type) + .arg(value) + .arg(units); +#if LIBMLT_VERSION_INT >= ((7 << 16) + (43 << 8)) + if (animation.get_loop() && animation.key_count() >= 2 + && index.row() == animation.key_count() - 1) + description += tr( + "\nLoop endpoint (playback wraps to the first value)"); +#endif + return description; } case FrameNumberRole: return position; @@ -338,6 +366,14 @@ QVariant KeyframesModel::data(const QModelIndex &index, int role) const max = 0; return max; } + case LoopRole: { +#if LIBMLT_VERSION_INT >= ((7 << 16) + (43 << 8)) + Mlt::Animation animation = m_filter->getAnimation(m_propertyNames[index.row()]); + return animation.is_valid() && animation.get_loop(); +#else + return false; +#endif + } default: break; } @@ -377,6 +413,7 @@ QHash KeyframesModel::roleNames() const roles[MaximumValueRole] = "maximum"; roles[LowestValueRole] = "lowest"; roles[HighestValueRole] = "highest"; + roles[LoopRole] = "isLoop"; roles[FrameNumberRole] = "frame"; roles[KeyframeTypeRole] = "interpolation"; roles[PrevKeyframeTypeRole] = "prevInterpolation"; @@ -438,8 +475,7 @@ bool KeyframesModel::remove(int parameterIndex, int keyframeIndex) m_filter->updateUndoCommand(key); } } - mlt_event_data eventData = mlt_event_data_from_string(name.toUtf8().constData()); - mlt_events_fire(m_filter->service().get_properties(), "property-changed", eventData); + notifyPropertyChanged(m_filter->service(), name); QModelIndex modelIndex; if (keyframeIndex > 0) { modelIndex = index(keyframeIndex - 1, 0, index(parameterIndex)); @@ -557,8 +593,7 @@ bool KeyframesModel::setInterpolation(int parameterIndex, int keyframeIndex, Int m_filter->updateUndoCommand(key); } } - mlt_event_data eventData = mlt_event_data_from_string(name.toUtf8().constData()); - mlt_events_fire(m_filter->service().get_properties(), "property-changed", eventData); + notifyPropertyChanged(m_filter->service(), name); QModelIndex modelIndex = index(keyframeIndex, 0, index(parameterIndex)); emit dataChanged(modelIndex, modelIndex, @@ -635,8 +670,7 @@ void KeyframesModel::setKeyframePosition(int parameterIndex, int keyframeIndex, m_filter->updateUndoCommand(key); } } - mlt_event_data eventData = mlt_event_data_from_string(name.toUtf8().constData()); - mlt_events_fire(m_filter->service().get_properties(), "property-changed", eventData); + notifyPropertyChanged(m_filter->service(), name); QModelIndex modelIndex = index(keyframeIndex, 0, index(parameterIndex)); emit dataChanged(modelIndex, modelIndex, QVector() << FrameNumberRole << NameRole); updateNeighborsMinMax(parameterIndex, keyframeIndex); @@ -891,6 +925,51 @@ void KeyframesModel::setKeyframeValuePosition(int parameterIndex, m_filter->endUndoCommand(); } +/*! + \qmlmethod void KeyframesModel::setLoop(int parameterIndex, bool loop) + \brief Sets whether the keyframes of parameter \a parameterIndex repeat. + + The last keyframe is the interpolation target; its frame evaluates to the first value. +*/ + +void KeyframesModel::setLoop(int parameterIndex, bool loop) +{ +#if LIBMLT_VERSION_INT >= ((7 << 16) + (43 << 8)) + if (!m_filter || parameterIndex < 0 || parameterIndex >= m_propertyNames.count()) + return; + QString name = m_propertyNames[parameterIndex]; + auto parameter = m_metadata->keyframes()->parameter(m_metadataIndex[parameterIndex]); + QStringList names = QStringList() << name << parameter->gangedProperties() + << parameter->gangedRectProperties(); + m_filter->startUndoParameterCommand(loop ? tr("Enable keyframe loop") + : tr("Disable keyframe loop")); + for (auto &key : names) { + Mlt::Animation animation = m_filter->getAnimation(key); + if (animation.is_valid() && animation.get_loop() != loop) { + animation.set_loop(loop); + // Regenerate the property string so that the undo state includes the loop. + m_filter->service().get(key.toUtf8().constData()); + m_filter->updateUndoCommand(key); + } + } + m_filter->endUndoCommand(); + notifyPropertyChanged(m_filter->service(), name); + emit dataChanged(index(parameterIndex), + index(parameterIndex), + QVector() << LoopRole << LowestValueRole << HighestValueRole); + if (m_keyframeCounts[parameterIndex] > 0) + emit dataChanged(index(0, 0, index(parameterIndex)), + index(m_keyframeCounts[parameterIndex] - 1, 0, index(parameterIndex)), + QVector() << NumericValueRole << NameRole); + emit m_filter->changed(name); + emit m_filter->propertyChanged(name); +#else + Q_UNUSED(parameterIndex) + Q_UNUSED(loop) + LOG_ERROR() << "Keyframe looping requires MLT 7.43.0 or newer"; +#endif +} + /*! \qmlmethod bool KeyframesModel::isKeyframe(int parameterIndex, int position) \brief Returns \c true if a keyframe exists at time \a position for \a parameterIndex. @@ -1162,3 +1241,41 @@ QStringList KeyframesModel::gangedProperties(int parameterIndex) const { return m_metadata->keyframes()->parameter(m_metadataIndex[parameterIndex])->gangedProperties(); } + +void KeyframesModel::matchFirstValue(int parameterIndex) +{ + if (!m_filter || parameterIndex < 0 || parameterIndex >= m_propertyNames.count()) { + LOG_ERROR() << "Invalid parameter index" << parameterIndex; + return; + } + const QString name = m_propertyNames[parameterIndex]; + auto parameter = m_metadata->keyframes()->parameter(m_metadataIndex[parameterIndex]); + QStringList names = QStringList() << name << parameter->gangedProperties() + << parameter->gangedRectProperties(); + names.removeDuplicates(); + m_filter->startUndoParameterCommand(tr("Match First Keyframe Value")); + for (const auto &key : names) { + Mlt::Animation animation = m_filter->getAnimation(key); + if (!animation.is_valid() || animation.key_count() < 2) + continue; + const int lastIndex = animation.key_count() - 1; + const int lastFrame = animation.key_get_frame(lastIndex); + const auto lastType = animation.key_get_type(lastIndex); + const QString value = m_filter->get(key, animation.key_get_frame(0)); + if (m_filter->service().anim_set(qUtf8Printable(key), + qUtf8Printable(value), + lastFrame, + m_filter->duration())) { + LOG_ERROR() << "Failed to match keyframe value" << key; + } else if (animation.key_set_type(lastIndex, lastType)) { + LOG_ERROR() << "Failed to restore keyframe type" << key; + } else { + animation.interpolate(); + m_filter->service().get(qUtf8Printable(key)); + m_filter->updateUndoCommand(key); + } + } + m_filter->endUndoCommand(); + emit m_filter->changed(name); + emit m_filter->propertyChanged(name); +} diff --git a/src/models/keyframesmodel.h b/src/models/keyframesmodel.h index c48d1638cd..77c1c1a95e 100644 --- a/src/models/keyframesmodel.h +++ b/src/models/keyframesmodel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 Meltytech, LLC + * Copyright (c) 2018-2026 Meltytech, LLC * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ class QmlFilter; class KeyframesModel : public QAbstractItemModel { Q_OBJECT + Q_PROPERTY(bool supportsLoop READ supportsLoop CONSTANT) public: enum InterpolationType { @@ -79,6 +80,7 @@ class KeyframesModel : public QAbstractItemModel MaximumValueRole, /// parameter only LowestValueRole, /// parameter only HighestValueRole, /// parameter only + LoopRole, /// parameter only FrameNumberRole, /// keyframe only KeyframeTypeRole, /// keyframe only PrevKeyframeTypeRole, /// keyframe only @@ -89,6 +91,7 @@ class KeyframesModel : public QAbstractItemModel explicit KeyframesModel(QObject *parent = 0); virtual ~KeyframesModel(); + bool supportsLoop() const; int rowCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const; @@ -114,6 +117,8 @@ class KeyframesModel : public QAbstractItemModel int keyframeIndex, double value, int position); + Q_INVOKABLE void setLoop(int parameterIndex, bool loop); + void matchFirstValue(int parameterIndex); Q_INVOKABLE bool isKeyframe(int parameterIndex, int position); Q_INVOKABLE bool advancedKeyframesInUse(); Q_INVOKABLE void removeAdvancedKeyframes(); diff --git a/src/qml/views/keyframes/KeyframeParameter.qml b/src/qml/views/keyframes/KeyframeParameter.qml index 67f3f54d59..963ccdd6f4 100644 --- a/src/qml/views/keyframes/KeyframeParameter.qml +++ b/src/qml/views/keyframes/KeyframeParameter.qml @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2023 Meltytech, LLC + * Copyright (c) 2018-2026 Meltytech, LLC * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ Item { property double minimum: 0 property double maximum: 1 property bool isLocked: false + property bool isLoop: false signal clicked(var keyframe, var parameter) signal rightClicked(var keyframe, var parameter) @@ -49,6 +50,7 @@ Item { clip: true onMinimumChanged: canvas.requestPaint() onMaximumChanged: canvas.requestPaint() + onIsLoopChanged: canvas.requestPaint() // When maximum == minimum only show the middle label Text { @@ -95,28 +97,26 @@ Item { return Math.sqrt(Math.pow(x1 - x0, 2) + Math.pow(y1 - y0, 2)); } - function drawCatmullRom(ctx, i, alpha, tension) { - var g = i - 2 >= 0 ? i - 2 : i; + function drawCatmullRom(ctx, pts, i, alpha, tension) { + var g = i - 2 >= 0 ? i - 2 : i - 1; var h = i - 1 >= 0 ? i - 1 : i; - var j = i + 1 < keyframesRepeater.count ? i + 1 : i; - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; + var j = i + 1 < pts.length ? i + 1 : i; var p = [ { - "x": keyframesRepeater.itemAt(g).x + widthOffset, - "y": keyframesRepeater.itemAt(g).y + heightOffset + "x": pts[g].x, + "y": pts[g].y }, { - "x": keyframesRepeater.itemAt(h).x + widthOffset, - "y": keyframesRepeater.itemAt(h).y + heightOffset + "x": pts[h].x, + "y": pts[h].y }, { - "x": keyframesRepeater.itemAt(i).x + widthOffset, - "y": keyframesRepeater.itemAt(i).y + heightOffset + "x": pts[i].x, + "y": pts[i].y }, { - "x": keyframesRepeater.itemAt(j).x + widthOffset, - "y": keyframesRepeater.itemAt(j).y + heightOffset + "x": pts[j].x, + "y": pts[j].y } ]; if (p[0].x == p[1].x) { @@ -125,7 +125,7 @@ Item { if (p[3].x == p[2].x) { p[3].x += 10000; } - var step = 1 / keyframesRepeater.itemAt(i).width; + var step = 1 / keyframesRepeater.itemAt(0).width; for (var t = 0.0; t < 1.0; t += step) { var m1 = 0.0; var m2 = 0.0; @@ -148,16 +148,14 @@ Item { } } - function drawSinusoidal(ctx, i, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawSinusoidal(ctx, pts, i, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; - var step = 1 / keyframesRepeater.itemAt(i).width; + var step = 1 / keyframesRepeater.itemAt(0).width; for (var t = 0.0; t < 1.0; t += step) { var factor = 0; if (ease === 1) { @@ -174,16 +172,14 @@ Item { } } - function drawPow(ctx, i, order, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawPow(ctx, pts, i, order, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; - var step = 1 / keyframesRepeater.itemAt(i).width; + var step = 1 / keyframesRepeater.itemAt(0).width; for (var t = 0.0; t < 1.0; t += step) { var factor = 0; if (ease === 1) { @@ -204,16 +200,14 @@ Item { } } - function drawExponential(ctx, i, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawExponential(ctx, pts, i, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; - var step = 1 / keyframesRepeater.itemAt(i).width; + var step = 1 / keyframesRepeater.itemAt(0).width; for (var t = 0.0; t < 1.0; t += step) { var factor = 0; if (t === 0.0) { @@ -238,16 +232,14 @@ Item { } } - function drawCircular(ctx, i, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawCircular(ctx, pts, i, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; - var step = 1 / keyframesRepeater.itemAt(i).width; + var step = 1 / keyframesRepeater.itemAt(0).width; for (var t = 0.0; t < 1.0; t += step) { var factor = 0; if (ease === 1) { @@ -268,16 +260,14 @@ Item { } } - function drawBack(ctx, i, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawBack(ctx, pts, i, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; - var step = 1 / keyframesRepeater.itemAt(i).width; + var step = 1 / keyframesRepeater.itemAt(0).width; for (var t = 0.0; t < 1.0; t += step) { var factor = 0; if (ease === 1) { @@ -301,13 +291,11 @@ Item { } } - function drawElastic(ctx, i, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawElastic(ctx, pts, i, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; var step = 1.0 / xd; @@ -357,13 +345,11 @@ Item { return 0; } - function drawBounce(ctx, i, ease) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - var x1 = keyframesRepeater.itemAt(i - 1).x + widthOffset; - var y1 = keyframesRepeater.itemAt(i - 1).y + heightOffset; - var x2 = keyframesRepeater.itemAt(i).x + widthOffset; - var y2 = keyframesRepeater.itemAt(i).y + heightOffset; + function drawBounce(ctx, pts, i, ease) { + var x1 = pts[i - 1].x; + var y1 = pts[i - 1].y; + var x2 = pts[i].x; + var y2 = pts[i].y; var xd = x2 - x1; var yd = y2 - y1; var step = 1.0 / xd; @@ -373,136 +359,231 @@ Item { } } - visible: isCurve + function drawSegment(ctx, pts, i) { + switch (pts[i - 1].interpolation) { + case KeyframesModel.DiscreteInterpolation: + ctx.lineTo(pts[i].x, pts[i - 1].y); + break; + default: + case KeyframesModel.LinearInterpolation: + ctx.lineTo(pts[i].x, pts[i].y); + break; + case KeyframesModel.SmoothLooseInterpolation: + drawCatmullRom(ctx, pts, i, 0.0, 1.0); + break; + case KeyframesModel.SmoothNaturalInterpolation: + drawCatmullRom(ctx, pts, i, 0.5, -1.0); + break; + case KeyframesModel.SmoothTightInterpolation: + drawCatmullRom(ctx, pts, i, 0.5, 0.0); + break; + case KeyframesModel.EaseInSinusoidal: + drawSinusoidal(ctx, pts, i, 1); + break; + case KeyframesModel.EaseOutSinusoidal: + drawSinusoidal(ctx, pts, i, -1); + break; + case KeyframesModel.EaseInOutSinusoidal: + drawSinusoidal(ctx, pts, i, 0); + break; + case KeyframesModel.EaseInQuadratic: + drawPow(ctx, pts, i, 2, 1); + break; + case KeyframesModel.EaseOutQuadratic: + drawPow(ctx, pts, i, 2, -1); + break; + case KeyframesModel.EaseInOutQuadratic: + drawPow(ctx, pts, i, 2, 0); + break; + case KeyframesModel.EaseInCubic: + drawPow(ctx, pts, i, 3, 1); + break; + case KeyframesModel.EaseOutCubic: + drawPow(ctx, pts, i, 3, -1); + break; + case KeyframesModel.EaseInOutCubic: + drawPow(ctx, pts, i, 3, 0); + break; + case KeyframesModel.EaseInQuartic: + drawPow(ctx, pts, i, 4, 1); + break; + case KeyframesModel.EaseOutQuartic: + drawPow(ctx, pts, i, 4, -1); + break; + case KeyframesModel.EaseInOutQuartic: + drawPow(ctx, pts, i, 4, 0); + break; + case KeyframesModel.EaseInQuintic: + drawPow(ctx, pts, i, 5, 1); + break; + case KeyframesModel.EaseOutQuintic: + drawPow(ctx, pts, i, 5, -1); + break; + case KeyframesModel.EaseInOutQuintic: + drawPow(ctx, pts, i, 5, 0); + break; + case KeyframesModel.EaseInExponential: + drawExponential(ctx, pts, i, 1); + break; + case KeyframesModel.EaseOutExponential: + drawExponential(ctx, pts, i, -1); + break; + case KeyframesModel.EaseInOutExponential: + drawExponential(ctx, pts, i, 0); + break; + case KeyframesModel.EaseInCircular: + drawCircular(ctx, pts, i, 1); + break; + case KeyframesModel.EaseOutCircular: + drawCircular(ctx, pts, i, -1); + break; + case KeyframesModel.EaseInOutCircular: + drawCircular(ctx, pts, i, 0); + break; + case KeyframesModel.EaseInBack: + drawBack(ctx, pts, i, 1); + break; + case KeyframesModel.EaseOutBack: + drawBack(ctx, pts, i, -1); + break; + case KeyframesModel.EaseInOutBack: + drawBack(ctx, pts, i, 0); + break; + case KeyframesModel.EaseInElastic: + drawElastic(ctx, pts, i, 1); + break; + case KeyframesModel.EaseOutElastic: + drawElastic(ctx, pts, i, -1); + break; + case KeyframesModel.EaseInOutElastic: + drawElastic(ctx, pts, i, 0); + break; + case KeyframesModel.EaseInBounce: + drawBounce(ctx, pts, i, 1); + break; + case KeyframesModel.EaseOutBounce: + drawBounce(ctx, pts, i, -1); + break; + case KeyframesModel.EaseInOutBounce: + drawBounce(ctx, pts, i, 0); + break; + } + if (pts[i - 1].interpolation !== KeyframesModel.DiscreteInterpolation) + ctx.lineTo(pts[i].x, pts[i].y); + ctx.moveTo(pts[i].x, pts[i].y); + } + + function keyframePoints() { + const pts = []; + const widthOffset = keyframesRepeater.itemAt(0).width / 2; + const heightOffset = keyframesRepeater.itemAt(0).height / 2; + for (let i = 0; i < keyframesRepeater.count; i++) { + const item = keyframesRepeater.itemAt(i); + pts.push({ + "x": item.x + widthOffset, + "y": item.y + heightOffset, + "interpolation": item.interpolation + }); + } + return pts; + } + + function cyclePoints(pts, offset, seamless) { + const n = pts.length; + const period = pts[n - 1].x - pts[0].x; + const result = []; + if (seamless) + result.push({ + "x": pts[n - 2].x + offset - period, + "y": pts[n - 2].y, + "interpolation": pts[n - 2].interpolation + }); + for (let i = 0; i < n; i++) + result.push({ + "x": pts[i].x + offset, + "y": pts[i].y, + "interpolation": pts[i].interpolation + }); + if (seamless) + result.push({ + "x": pts[1].x + offset + period, + "y": pts[1].y, + "interpolation": pts[1].interpolation + }); + return result; + } + + function drawGhostMarker(ctx, p) { + const size = keyframesRepeater.itemAt(0).width / 2; + ctx.beginPath(); + ctx.moveTo(p.x, p.y - size); + ctx.lineTo(p.x + size, p.y); + ctx.lineTo(p.x, p.y + size); + ctx.lineTo(p.x - size, p.y); + ctx.closePath(); + ctx.stroke(); + } + anchors.fill: parent + onWidthChanged: requestPaint() onPaint: { - var ctx = getContext("2d"); + const ctx = getContext("2d"); + ctx.clearRect(0, 0, canvas.width, canvas.height); + if (!keyframesRepeater.count) + return; ctx.strokeStyle = activePalette.buttonText; ctx.lineWidth = 1; - ctx.clearRect(0, 0, canvas.width, canvas.height); - ctx.beginPath(); - if (keyframesRepeater.count) { - var widthOffset = keyframesRepeater.itemAt(0).width / 2; - var heightOffset = keyframesRepeater.itemAt(0).height / 2; - // Draw extent before first keyframe. - ctx.moveTo(0, keyframesRepeater.itemAt(0).y + heightOffset); - ctx.lineTo(keyframesRepeater.itemAt(0).x + widthOffset, keyframesRepeater.itemAt(0).y + heightOffset); - // Draw lines between keyframes. - for (var i = 1; i < keyframesRepeater.count; i++) { - switch (keyframesRepeater.itemAt(i - 1).interpolation) { - case KeyframesModel.DiscreteInterpolation: - ctx.lineTo(keyframesRepeater.itemAt(i).x + widthOffset, keyframesRepeater.itemAt(i - 1).y + heightOffset); - break; - default: - case KeyframesModel.LinearInterpolation: - ctx.lineTo(keyframesRepeater.itemAt(i).x + widthOffset, keyframesRepeater.itemAt(i).y + heightOffset); - break; - case KeyframesModel.SmoothLooseInterpolation: - drawCatmullRom(ctx, i, 0.0, 1.0); - break; - case KeyframesModel.SmoothNaturalInterpolation: - drawCatmullRom(ctx, i, 0.5, -1.0); - break; - case KeyframesModel.SmoothTightInterpolation: - drawCatmullRom(ctx, i, 0.5, 0.0); - break; - case KeyframesModel.EaseInSinusoidal: - drawSinusoidal(ctx, i, 1); - break; - case KeyframesModel.EaseOutSinusoidal: - drawSinusoidal(ctx, i, -1); - break; - case KeyframesModel.EaseInOutSinusoidal: - drawSinusoidal(ctx, i, 0); - break; - case KeyframesModel.EaseInQuadratic: - drawPow(ctx, i, 2, 1); - break; - case KeyframesModel.EaseOutQuadratic: - drawPow(ctx, i, 2, -1); - break; - case KeyframesModel.EaseInOutQuadratic: - drawPow(ctx, i, 2, 0); - break; - case KeyframesModel.EaseInCubic: - drawPow(ctx, i, 3, 1); - break; - case KeyframesModel.EaseOutCubic: - drawPow(ctx, i, 3, -1); - break; - case KeyframesModel.EaseInOutCubic: - drawPow(ctx, i, 3, 0); - break; - case KeyframesModel.EaseInQuartic: - drawPow(ctx, i, 4, 1); - break; - case KeyframesModel.EaseOutQuartic: - drawPow(ctx, i, 4, -1); - break; - case KeyframesModel.EaseInOutQuartic: - drawPow(ctx, i, 4, 0); - break; - case KeyframesModel.EaseInQuintic: - drawPow(ctx, i, 5, 1); - break; - case KeyframesModel.EaseOutQuintic: - drawPow(ctx, i, 5, -1); - break; - case KeyframesModel.EaseInOutQuintic: - drawPow(ctx, i, 5, 0); - break; - case KeyframesModel.EaseInExponential: - drawExponential(ctx, i, 1); - break; - case KeyframesModel.EaseOutExponential: - drawExponential(ctx, i, -1); - break; - case KeyframesModel.EaseInOutExponential: - drawExponential(ctx, i, 0); - break; - case KeyframesModel.EaseInCircular: - drawCircular(ctx, i, 1); - break; - case KeyframesModel.EaseOutCircular: - drawCircular(ctx, i, -1); - break; - case KeyframesModel.EaseInOutCircular: - drawCircular(ctx, i, 0); - break; - case KeyframesModel.EaseInBack: - drawBack(ctx, i, 1); - break; - case KeyframesModel.EaseOutBack: - drawBack(ctx, i, -1); - break; - case KeyframesModel.EaseInOutBack: - drawBack(ctx, i, 0); - break; - case KeyframesModel.EaseInElastic: - drawElastic(ctx, i, 1); - break; - case KeyframesModel.EaseOutElastic: - drawElastic(ctx, i, -1); - break; - case KeyframesModel.EaseInOutElastic: - drawElastic(ctx, i, 0); - break; - case KeyframesModel.EaseInBounce: - drawBounce(ctx, i, 1); - break; - case KeyframesModel.EaseOutBounce: - drawBounce(ctx, i, -1); - break; - case KeyframesModel.EaseInOutBounce: - drawBounce(ctx, i, 0); - break; + const pts = keyframePoints(); + const n = pts.length; + const loop = isLoop && n >= 2 && pts[n - 1].x > pts[0].x; + const period = loop ? pts[n - 1].x - pts[0].x : 0; + const seamless = loop && pts[0].y === pts[n - 1].y; + const cycle = loop ? cyclePoints(pts, 0, seamless) : pts; + const first = seamless ? 1 : 0; + const last = first + n - 1; + if (isCurve) { + ctx.beginPath(); + ctx.moveTo(0, cycle[first].y); + ctx.lineTo(cycle[first].x, cycle[first].y); + for (let i = first + 1; i <= last; i++) + drawSegment(ctx, cycle, i); + if (loop) + ctx.lineTo(cycle[last].x, cycle[first].y); + else + ctx.lineTo(width, cycle[last].y); + ctx.stroke(); + } + if (loop) { + ctx.globalAlpha = 0.4; + if (isCurve && !seamless) + drawGhostMarker(ctx, { + "x": pts[n - 1].x, + "y": pts[0].y + }); + ctx.setLineDash([4, 3]); + for (let c = 1; pts[0].x + c * period < width && c * n < 10000; c++) { + const ghost = cyclePoints(pts, c * period, seamless); + if (isCurve) { + ctx.beginPath(); + ctx.moveTo(ghost[first].x, ghost[first].y); + for (let i = first + 1; i <= last; i++) + drawSegment(ctx, ghost, i); + ctx.lineTo(ghost[last].x, ghost[first].y); + ctx.stroke(); } - ctx.moveTo(keyframesRepeater.itemAt(i).x + widthOffset, keyframesRepeater.itemAt(i).y + heightOffset); + ctx.setLineDash([]); + for (let i = first + 1; i <= last && ghost[i].x <= width; i++) + drawGhostMarker(ctx, ghost[i]); + if (isCurve && !seamless && ghost[last].x <= width) + drawGhostMarker(ctx, { + "x": ghost[last].x, + "y": ghost[first].y + }); + ctx.setLineDash([4, 3]); } - // Draw extent after last keyframe. - ctx.lineTo(width, keyframesRepeater.itemAt(i - 1).y + heightOffset); + ctx.setLineDash([]); + ctx.globalAlpha = 1; } - ctx.stroke(); } } diff --git a/src/qml/views/keyframes/ParameterHead.qml b/src/qml/views/keyframes/ParameterHead.qml index 53f7eeae6b..50cc768951 100644 --- a/src/qml/views/keyframes/ParameterHead.qml +++ b/src/qml/views/keyframes/ParameterHead.qml @@ -29,6 +29,7 @@ Rectangle { property bool current: false property bool isCurve: false property bool zoomHeight: false + property bool isLoop: false property int delegateIndex: -1 signal clicked @@ -229,6 +230,28 @@ Rectangle { } } + ToolButton { + id: loopButton + + visible: delegateIndex >= 0 && parameters.supportsLoop + checkable: true + checked: isLoop + icon.name: 'media-playback-loop' + icon.source: 'qrc:///icons/oxygen/32x32/actions/media-playback-loop.png' + icon.width: 16 + icon.height: 16 + padding: 1 + focusPolicy: Qt.NoFocus + onClicked: { + parameters.setLoop(delegateIndex, !isLoop); + checked = Qt.binding(() => isLoop); + } + + Shotcut.HoverTip { + text: qsTr('Loop keyframes') + } + } + ToolButton { id: lockButton diff --git a/src/qml/views/keyframes/keyframes.qml b/src/qml/views/keyframes/keyframes.qml index d3060510af..13d16175ac 100644 --- a/src/qml/views/keyframes/keyframes.qml +++ b/src/qml/views/keyframes/keyframes.qml @@ -179,6 +179,7 @@ Rectangle { trackName: model.name delegateIndex: index isCurve: model.isCurve + isLoop: model.isLoop width: headerWidth height: Logic.trackHeight(isCurve) current: index === currentTrack @@ -594,6 +595,7 @@ Rectangle { rootIndex: parameterDelegateModel.modelIndex(index) width: producer.duration * timeScale isCurve: model.isCurve + isLoop: model.isLoop minimum: model.minimum maximum: model.maximum height: Logic.trackHeight(model.isCurve) diff --git a/src/qmltypes/qmlfilter.cpp b/src/qmltypes/qmlfilter.cpp index df750a643a..fd32c203c7 100644 --- a/src/qmltypes/qmlfilter.cpp +++ b/src/qmltypes/qmlfilter.cpp @@ -172,17 +172,19 @@ QmlFilter::~QmlFilter() {} \qmlmethod string Filter::get(string name, int position = -1) \brief Returns the value of MLT property \a name as a string. If time \a position is \c -1 (default), returns the current value; - otherwise returns the interpolated value at that frame position. + otherwise returns the control value at a keyframe or the interpolated value between keyframes. To get an integer value, convert the result using \c parseInt(), e.g. \c parseInt(filter.get("someProperty")). */ QString QmlFilter::get(QString name, int position) { if (m_service.is_valid()) { + auto properties = propertiesForValueRead(name, position); if (position < 0) - return QString::fromUtf8(m_service.get(qUtf8Printable(name))); + return QString::fromUtf8(properties.get(qUtf8Printable(name))); else - return QString::fromUtf8(m_service.anim_get(qUtf8Printable(name), position, duration())); + return QString::fromUtf8( + properties.anim_get(qUtf8Printable(name), position, duration())); } else { return QString(); } @@ -198,10 +200,11 @@ QColor QmlFilter::getColor(QString name, int position) { mlt_color color = {0, 0, 0, 0}; if (m_service.is_valid()) { + auto properties = propertiesForValueRead(name, position); if (position < 0) - color = m_service.get_color(qUtf8Printable(name)); + color = properties.get_color(qUtf8Printable(name)); else - color = m_service.anim_get_color(qUtf8Printable(name), position, duration()); + color = properties.anim_get_color(qUtf8Printable(name), position, duration()); } return QColor(color.r, color.g, color.b, color.a); } @@ -215,10 +218,11 @@ QColor QmlFilter::getColor(QString name, int position) double QmlFilter::getDouble(QString name, int position) { if (m_service.is_valid()) { + auto properties = propertiesForValueRead(name, position); if (position < 0) - return m_service.get_double(qUtf8Printable(name)); + return properties.get_double(qUtf8Printable(name)); else - return m_service.anim_get_double(qUtf8Printable(name), position, duration()); + return properties.anim_get_double(qUtf8Printable(name), position, duration()); } else { return 0.0; } @@ -235,15 +239,17 @@ QRectF QmlFilter::getRect(QString name, int position) { if (!m_service.is_valid()) return QRectF(); - const char *s = m_service.get(qUtf8Printable(name)); + auto properties = propertiesForValueRead(name, position); + const char *s = properties.get(qUtf8Printable(name)); if (s) { + const bool hasPercent = ::strchr(s, '%'); mlt_rect rect; if (position < 0) { - rect = m_service.get_rect(qUtf8Printable(name)); + rect = properties.get_rect(qUtf8Printable(name)); } else { - rect = m_service.anim_get_rect(qUtf8Printable(name), position, duration()); + rect = properties.anim_get_rect(qUtf8Printable(name), position, duration()); } - if (::strchr(s, '%')) { + if (hasPercent) { return QRectF(qRound(rect.x * MLT.profile().width()), qRound(rect.y * MLT.profile().height()), qRound(rect.w * MLT.profile().width()), @@ -277,7 +283,8 @@ void QmlFilter::removeRectPercents(QString name) int position; mlt_keyframe_type keyType; anim->key_get(i, position, keyType); - rect = m_service.anim_get_rect(qUtf8Printable(name), position, duration()); + auto properties = propertiesForValueRead(name, position); + rect = properties.anim_get_rect(qUtf8Printable(name), position, duration()); auto r = QRectF(qRound(rect.x * MLT.profile().width()), qRound(rect.y * MLT.profile().height()), qRound(rect.w * MLT.profile().width()), @@ -361,8 +368,7 @@ void QmlFilter::set(QString name, QString value, int position) } else { // Only set an animation keyframe if it does not already exist with the same value. Mlt::Animation animation(m_service.get_animation(qUtf8Printable(name))); - if (!animation.is_valid() || !animation.is_key(position) - || value != m_service.anim_get(qUtf8Printable(name), position, duration())) { + if (!animation.is_valid() || !animation.is_key(position) || value != get(name, position)) { m_service.anim_set(qUtf8Printable(name), qUtf8Printable(value), position, duration()); emit changed(name); updateUndoCommand(name); @@ -385,9 +391,8 @@ void QmlFilter::set(QString name, const QColor &value, int position, mlt_keyfram } else { // Only set an animation keyframe if it does not already exist with the same value. Mlt::Animation animation(m_service.get_animation(qUtf8Printable(name))); - auto mltColor = m_service.anim_get_color(qUtf8Printable(name), position, duration()); if (!animation.is_valid() || !animation.is_key(position) - || value != QColor(mltColor.r, mltColor.g, mltColor.b, mltColor.a)) { + || value != getColor(name, position)) { m_service.anim_set(qUtf8Printable(name), Util::mltColorFromQColor(value), position, @@ -419,7 +424,7 @@ void QmlFilter::set(QString name, double value, int position, mlt_keyframe_type // Only set an animation keyframe if it does not already exist with the same value. Mlt::Animation animation(m_service.get_animation(qUtf8Printable(name))); if (!animation.is_valid() || !animation.is_key(position) - || value != m_service.anim_get_double(qUtf8Printable(name), position, duration())) { + || value != getDouble(name, position)) { mlt_keyframe_type type = getKeyframeType(animation, position, keyframeType); m_service.anim_set(qUtf8Printable(name), value, position, duration(), type); emit changed(name); @@ -448,8 +453,9 @@ void QmlFilter::set(QString name, int value, int position, mlt_keyframe_type key } else { // Only set an animation keyframe if it does not already exist with the same value. Mlt::Animation animation(m_service.get_animation(qUtf8Printable(name))); + auto properties = propertiesForValueRead(name, position); if (!animation.is_valid() || !animation.is_key(position) - || value != m_service.anim_get_int(qUtf8Printable(name), position, duration())) { + || value != properties.anim_get_int(qUtf8Printable(name), position, duration())) { mlt_keyframe_type type = getKeyframeType(animation, position, keyframeType); m_service.anim_set(qUtf8Printable(name), value, position, duration(), type); emit changed(name); @@ -483,7 +489,8 @@ void QmlFilter::set(QString name, updateUndoCommand(name); } } else { - mlt_rect rect = m_service.anim_get_rect(qUtf8Printable(name), position, duration()); + auto properties = propertiesForValueRead(name, position); + mlt_rect rect = properties.anim_get_rect(qUtf8Printable(name), position, duration()); // Only set an animation keyframe if it does not already exist with the same value. Mlt::Animation animation(m_service.get_animation(qUtf8Printable(name))); if (!animation.is_valid() || !animation.is_key(position) || x != rect.x || y != rect.y @@ -1077,6 +1084,39 @@ int QmlFilter::keyframeIndex(Mlt::Animation &animation, int position) return result; } +// Returns properties for reading the value at position. Normally this wraps +// the service properties. At the original endpoint of a loop, playback +// evaluates to the first value, but controls need the authored endpoint value. +// +// For that endpoint, return a temporary copy with looping disabled so the +// existing typed MLT getters can read the authored value using the same +// locale and profile. Never disable looping on the live animation: rendering +// may read it concurrently. Changes to the returned copy are not applied to +// the service. +Mlt::Properties QmlFilter::propertiesForValueRead(const QString &name, int position) +{ +#if LIBMLT_VERSION_INT >= ((7 << 16) + (43 << 8)) + if (position >= 0) { + auto animation = getAnimation(name); + if (animation.is_valid() && animation.get_loop() && animation.key_count() >= 2 + && position == animation.key_get_frame(animation.key_count() - 1)) { + Mlt::Properties properties; + properties.set_lcnumeric(mlt_properties_get_lcnumeric(m_service.get_properties())); + properties.set("_profile", m_service.get_data("_profile"), 0); + properties.set(qUtf8Printable(name), m_service.get(qUtf8Printable(name))); + properties.anim_get(qUtf8Printable(name), position, duration()); + Mlt::Animation copy(properties.get_animation(qUtf8Printable(name))); + copy.set_loop(false); + return properties; + } + } +#else + Q_UNUSED(name) + Q_UNUSED(position) +#endif + return Mlt::Properties(m_service.get_properties()); +} + void QmlFilter::startUndoTracking() { m_previousState = Mlt::Properties(); diff --git a/src/qmltypes/qmlfilter.h b/src/qmltypes/qmlfilter.h index c0a7de0e19..b43e11dc79 100644 --- a/src/qmltypes/qmlfilter.h +++ b/src/qmltypes/qmlfilter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2024 Meltytech, LLC + * Copyright (c) 2013-2026 Meltytech, LLC * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -176,6 +176,7 @@ public slots: int m_changeInProgress; int keyframeIndex(Mlt::Animation &animation, int position); + Mlt::Properties propertiesForValueRead(const QString &name, int position); }; class AnalyzeDelegate : public QObject