Skip to content

GitLab

Commit b3a4ae10 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Various fixes for timeremap

parent e0765a83
Hide whitespace changes
Inline Side-by-side
src/dialogs/timeremap.cpp
View file @ b3a4ae10
......@@ -216,6 +216,7 @@ void RemapView::setDuration(std::shared_ptr<Mlt::Producer> service, int duration
}
bool keyframeAdded = false;
if (m_duration > 0 && m_service && !m_keyframes.isEmpty()) {
m_keyframesOrigin = m_keyframes;
if (duration > m_duration) {
// The clip was resized, ensure we have a keyframe at the end of the clip will freeze at last keyframe
QMap<int, int>::const_iterator it = m_keyframes.constEnd();
......@@ -234,21 +235,38 @@ void RemapView::setDuration(std::shared_ptr<Mlt::Producer> service, int duration
}
} else if (duration < m_duration) {
keyframeAdded = true;
QMap<int, int>::const_iterator it = m_keyframes.constEnd();
it--;
int lastKeyframePos = it.key();
int lastKeyframeValue = it.value();
// Remove all Keyframes after duration
int lastPos = m_inFrame + duration - 1;
std::pair<double,double>speeds = getSpeed({lastKeyframePos,lastKeyframeValue});
if (lastKeyframePos == m_inFrame + m_duration - 1) {
// Move last keyframe
it--;
//TODO: check we still have a keyframe at it pos
int updatedVal = it.value() + ((lastPos - it.key()) / speeds.first);
m_keyframes.remove(lastKeyframePos);
m_keyframes.insert(lastPos, updatedVal);
QList <int> toDelete;
QMapIterator<int, int> i(m_keyframes);
while (i.hasNext()) {
i.next();
if (i.key() > duration + m_inFrame) {
toDelete << i.key();
}
}
if (!toDelete.isEmpty()) {
// Move last keyframe to end pos
int posToMove = toDelete.takeFirst();
if (!m_keyframes.contains(lastPos)) {
int lastKeyframeValue = m_keyframes.value(posToMove);
std::pair<double,double>speeds = getSpeed({posToMove,lastKeyframeValue});
m_keyframes.remove(posToMove);
while (!toDelete.isEmpty()) {
m_keyframes.remove(toDelete.takeFirst());
}
int updatedVal = m_keyframes.value(m_keyframes.lastKey()) + ((lastPos - m_keyframes.lastKey()) / speeds.first);
m_keyframes.insert(lastPos, updatedVal);
}
} else {
while (!toDelete.isEmpty()) {
m_keyframes.remove(toDelete.takeFirst());
}
}
}
if (m_keyframes != m_keyframesOrigin) {
updateKeyframesWithUndo(m_keyframes, m_keyframesOrigin);
}
}
if (service == nullptr) {
// We are updating an existing remap effect due to duration change
......@@ -285,7 +303,7 @@ void RemapView::loadKeyframes(const QString &mapData)
std::pair<double,double>speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
emit atKeyframe(true);
emit atKeyframe(true, true);
updateKeyframes(false);
} else {
QStringList str = mapData.split(QLatin1Char(';'));
......@@ -297,12 +315,13 @@ void RemapView::loadKeyframes(const QString &mapData)
m_duration = qMax(m_duration, val - m_inFrame);
}
if (m_keyframes.contains(m_currentKeyframe.first)) {
emit atKeyframe(true);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
std::pair<double,double>speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
} else {
emit atKeyframe(false);
emit atKeyframe(false, false);
m_currentKeyframe = {-1,-1};
emit selectedKf(m_currentKeyframe, {-1,-1} );
}
......@@ -535,15 +554,22 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
return;
}
if (m_moveKeyframeMode == CursorMove || (event->y() < m_centerPos)) {
if (m_moveKeyframeMode == CursorMove) {
if (pos != m_position) {
slotSetPosition(pos + m_inFrame);
emit seekToPos(pos + m_inFrame, -1);
}
}
if (m_moveKeyframeMode == CursorMoveBottom || (event->y() > m_centerPos)) {
if (m_moveKeyframeMode == CursorMoveBottom) {
if (pos != m_bottomPosition) {
m_bottomPosition = pos;
bool isKfr = m_keyframes.contains(m_bottomPosition + m_inFrame);
if (isKfr) {
bool isLast = m_bottomPosition + m_inFrame == m_keyframes.firstKey() || m_bottomPosition + m_inFrame == m_keyframes.lastKey();
emit atKeyframe(isKfr, isLast);
} else {
emit atKeyframe(false, false);
}
pos = GenTime(m_remapLink->anim_get_double("map", pos + m_inFrame)).frames(pCore->getCurrentFps());
slotSetPosition(pos);
emit seekToPos(-1, m_bottomPosition);
......@@ -631,7 +657,8 @@ void RemapView::centerCurrentKeyframe()
std::pair<double,double> speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
emit atKeyframe(true);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
updateKeyframes(true);
update();
}
......@@ -665,7 +692,8 @@ void RemapView::centerCurrentTopKeyframe()
std::pair<double,double> speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
emit atKeyframe(true);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
updateKeyframes(true);
update();
}
......@@ -714,11 +742,8 @@ void RemapView::mousePressEvent(QMouseEvent *event)
{
event->accept();
m_lastMaxDuration = remapMax();
double zoomStart = m_zoomHandle.x() * (width() - 2 * m_offset);
double zoomEnd = m_zoomHandle.y() * (width() - 2 * m_offset);
double zoomFactor = (width() - 2 * m_offset) / (zoomEnd - zoomStart);
int pos = int(((event->x() - m_offset) / zoomFactor + zoomStart ) / m_scale);
pos = qBound(0, pos, m_lastMaxDuration);
int pos = int(((event->x() - m_offset) / m_zoomFactor + m_zoomStart ) / m_scale);
pos = qBound(0, pos, m_maxLength);
m_moveKeyframeMode = NoMove;
m_keyframesOrigin = m_keyframes;
m_oldInFrame = m_inFrame;
......@@ -765,7 +790,8 @@ void RemapView::mousePressEvent(QMouseEvent *event)
if (KdenliveSettings::keyframeseek()) {
slotSetPosition(m_currentKeyframeOriginal.second);
m_bottomPosition = m_currentKeyframeOriginal.first - m_inFrame;
emit atKeyframe(true);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
} else {
update();
}
......@@ -778,8 +804,8 @@ void RemapView::mousePressEvent(QMouseEvent *event)
// no keyframe next to mouse
//m_selectedKeyframes.clear();
//m_currentKeyframe = m_currentKeyframeOriginal = {-1,-1};
m_moveKeyframeMode = CursorMove;
if (pos != m_position) {
m_moveKeyframeMode = CursorMove;
slotSetPosition(pos + m_inFrame);
emit seekToPos(pos + m_inFrame, -1);
update();
......@@ -832,7 +858,8 @@ void RemapView::mousePressEvent(QMouseEvent *event)
m_bottomPosition = m_currentKeyframeOriginal.first - m_inFrame;
int topPos = GenTime(m_remapLink->anim_get_double("map", m_currentKeyframeOriginal.first)).frames(pCore->getCurrentFps());
m_position = topPos - m_inFrame;
emit atKeyframe(true);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
} else {
update();
}
......@@ -845,9 +872,16 @@ void RemapView::mousePressEvent(QMouseEvent *event)
// no keyframe next to mouse
//m_selectedKeyframes.clear();
//m_currentKeyframe = m_currentKeyframeOriginal = {-1,-1};
m_moveKeyframeMode = CursorMoveBottom;
if (pos != m_bottomPosition) {
m_bottomPosition = pos;
m_moveKeyframeMode = CursorMoveBottom;
bool isKfr = m_keyframes.contains(m_bottomPosition + m_inFrame);
if (isKfr) {
bool isLast = m_bottomPosition + m_inFrame == m_keyframes.firstKey() || m_bottomPosition + m_inFrame == m_keyframes.lastKey();
emit atKeyframe(isKfr, isLast);
} else {
emit atKeyframe(false, false);
}
//slotUpdatePosition();
emit seekToPos(-1, pos);
update();
......@@ -979,8 +1013,18 @@ void RemapView::slotSetPosition(int pos)
void RemapView::slotSetBottomPosition(int pos)
{
qDebug()<<"=== SETTING BOTTOM POS: "<<pos;
m_bottomPosition = pos;
update();
if (pos != m_bottomPosition) {
m_bottomPosition = pos;
qDebug()<<"==== CURRENT: "<<(m_bottomPosition + m_inFrame)<<" = "<<m_keyframes.keys();
bool isKfr = m_keyframes.contains(m_bottomPosition + m_inFrame);
if (isKfr) {
bool isLast = m_bottomPosition + m_inFrame == m_keyframes.firstKey() || m_bottomPosition + m_inFrame == m_keyframes.lastKey();
emit atKeyframe(isKfr, isLast);
} else {
emit atKeyframe(false, false);
}
update();
}
}
void RemapView::goNext()
......@@ -998,6 +1042,8 @@ void RemapView::goNext()
std::pair<double,double> speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
break;
}
}
......@@ -1023,6 +1069,8 @@ void RemapView::goPrev()
std::pair<double,double> speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
previousFound = true;
}
......@@ -1178,14 +1226,15 @@ std::pair<double,double> RemapView::getSpeed(std::pair<int,int>kf)
void RemapView::addKeyframe()
{
// insert or remove keyframe at interpolated position
m_keyframesOrigin = m_keyframes;
if (m_keyframes.contains(m_bottomPosition + m_inFrame)) {
m_keyframes.remove(m_bottomPosition + m_inFrame);
if (m_currentKeyframe.first == m_bottomPosition + m_inFrame) {
m_currentKeyframe = m_currentKeyframeOriginal = {-1,-1};
emit selectedKf(m_currentKeyframe, {-1,-1});
}
emit atKeyframe(false);
updateKeyframes(false);
emit atKeyframe(false, false);
updateKeyframesWithUndo(m_keyframes, m_keyframesOrigin);
update();
return;
}
......@@ -1222,11 +1271,13 @@ void RemapView::addKeyframe()
}
m_keyframes.insert(newKeyframe.first, newKeyframe.second);
m_currentKeyframe = newKeyframe;
m_selectedKeyframes = {m_currentKeyframe};
std::pair<double,double> speeds = getSpeed(m_currentKeyframe);
std::pair<bool,bool> atEnd = {m_currentKeyframe.first == m_inFrame, m_currentKeyframe.first == m_keyframes.lastKey()};
emit selectedKf(m_currentKeyframe, speeds, atEnd);
emit atKeyframe(true);
updateKeyframes(true);
bool isLast = m_currentKeyframe.first == m_keyframes.firstKey() || m_currentKeyframe.first == m_keyframes.lastKey();
emit atKeyframe(true, isLast);
updateKeyframesWithUndo(m_keyframes, m_keyframesOrigin);
update();
}
......@@ -1508,8 +1559,7 @@ TimeRemap::TimeRemap(QWidget *parent)
});
connect(button_center, &QToolButton::clicked, m_view, &RemapView::centerCurrentKeyframe);
connect(button_center_top, &QToolButton::clicked, m_view, &RemapView::centerCurrentTopKeyframe);
connect(m_view, &RemapView::atKeyframe, button_add, [&](bool atKeyframe) {
qDebug()<<"==== ARE WE AT A KEYFRAME: "<<atKeyframe<<"\n__________________";
connect(m_view, &RemapView::atKeyframe, button_add, [&](bool atKeyframe, bool last) {
if (atKeyframe) {
button_add->setIcon(QIcon::fromTheme(QStringLiteral("keyframe-remove")));
button_add->setToolTip(i18n("Delete keyframe"));
......@@ -1517,6 +1567,7 @@ TimeRemap::TimeRemap(QWidget *parent)
button_add->setIcon(QIcon::fromTheme(QStringLiteral("keyframe-add")));
button_add->setToolTip(i18n("Add keyframe"));
}
button_add->setEnabled(!atKeyframe || !last);
});
connect(speedBefore, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, [&](double speed) {
m_view->updateBeforeSpeed(speed);
......@@ -1553,15 +1604,13 @@ const QString &TimeRemap::currentClip() const
void TimeRemap::checkClipUpdate(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int>& roles)
{
int id = int(topLeft.internalId());
if (m_cid != id) {
if (m_cid != id || !roles.contains(TimelineModel::FinalMoveRole)) {
return;
}
// Don't resize view if we are moving a keyframe
if (roles.contains(TimelineModel::DurationRole) && !m_view->movingKeyframe()) {
m_lastLength = pCore->getItemDuration({ObjectType::TimelineClip,m_cid});
qDebug()<<"===== UPDATING CLIP DURATION: "<<m_lastLength<<"\n_________________________________________";
int min = pCore->getItemIn({ObjectType::TimelineClip,m_cid});
int max = min + m_lastLength;
m_view->m_startPos = pCore->getItemPosition({ObjectType::TimelineClip,m_cid});
m_in->setRange(0, m_view->m_maxLength - min);
m_out->setRange(0, INT_MAX);
......@@ -1569,9 +1618,8 @@ void TimeRemap::checkClipUpdate(const QModelIndex &topLeft, const QModelIndex &b
m_view->update();
} else if (roles.contains(TimelineModel::StartRole) && !m_view->movingKeyframe()) {
m_view->m_startPos = pCore->getItemPosition({ObjectType::TimelineClip,m_cid});
m_view->update();
} else {
qDebug()<<"======= RESIZE TIMEREMAP ABORTED!\nRESIZED CLIP: "<<id<<" = "<<m_cid;
int duration = pCore->getItemDuration({ObjectType::TimelineClip,m_cid});
m_view->setDuration(nullptr, duration);
}
}
......@@ -1637,6 +1685,8 @@ void TimeRemap::selectedClip(int cid)
}
QString mapData(fromLink->get("map"));
m_view->loadKeyframes(mapData);
QSignalBlocker bk(pitch_compensate);
QSignalBlocker bk2(frame_blending);
pitch_compensate->setChecked(fromLink->get_int("pitch") == 1);
frame_blending->setChecked(fromLink->get("image_mode") == QLatin1String("blend"));
keyframesLoaded = true;
......@@ -1792,7 +1842,7 @@ void TimeRemap::updateKeyframesWithUndo(QMap<int,int>updatedKeyframes, QMap<int,
bool useBlend = frame_blending->isChecked();
bool hadPitch = m_view->m_remapLink->get_int("pitch") == 1;
bool hadBlend = m_view->m_remapLink->get("image_mode") == QLatin1String("blend");
bool durationChanged = updatedKeyframes.isEmpty() ? false : updatedKeyframes.lastKey() - updatedKeyframes.firstKey() != previousKeyframes.lastKey() - previousKeyframes.firstKey();
bool durationChanged = updatedKeyframes.isEmpty() ? false : updatedKeyframes.lastKey() - pCore->getItemIn({ObjectType::TimelineClip,m_cid}) + 1 != pCore->getItemDuration({ObjectType::TimelineClip,m_cid});
Fun undo = []() { return true; };
Fun redo = []() { return true; };
Fun local_undo = [this, link = m_view->m_remapLink, splitLink = m_splitRemap, previousKeyframes, cid = m_cid, oldIn = m_view->m_oldInFrame, hadPitch, hadBlend]() {
......@@ -1873,8 +1923,8 @@ void TimeRemap::updateKeyframesWithUndo(QMap<int,int>updatedKeyframes, QMap<int,
}
}
local_redo();
UPDATE_UNDO_REDO_NOLOCK(local_redo, local_undo, undo, redo);
pCore->pushUndo(undo, redo, i18n("Edit Timeremap keyframes"));
UPDATE_UNDO_REDO_NOLOCK(redo, undo, local_undo, local_redo);
pCore->pushUndo(local_undo, local_redo, i18n("Edit Timeremap keyframes"));
}
void TimeRemap::switchRemapParam()
......
src/dialogs/timeremap.h
View file @ b3a4ae10
......@@ -71,6 +71,8 @@ protected:
/** @brief The in frame of the clip in timeline, used to correctly offset keyframes */
int m_inFrame;
int m_oldInFrame;
/** @brief the original in/out of the clip when opening the remap widget, used to snap to ends */
std::pair<int,int> m_originalRange;
public slots:
void updateInPos(int pos);
......@@ -92,8 +94,6 @@ private:
int m_duration;
int m_lastMaxDuration;
int m_position;
/** @brief the original in/out of the clip when opening the remap widget, used to snap to ends */
std::pair<int,int> m_originalRange;
/** @brief the maximum duration of the parent (bin) clip */
int m_maxLength;
int m_bottomPosition;
......@@ -138,7 +138,7 @@ signals:
void selectedKf(std::pair<int,int>, std::pair<double,double>, std::pair<bool,bool>atEnd = {true,true});
void updateSpeeds(std::pair<double,double>);
/** When the cursor position changes inform parent if we are on a keyframe or not. */
void atKeyframe(bool);
void atKeyframe(bool isKeyframe, bool last);
void updateKeyframes(bool resize);
void updateKeyframesWithUndo(QMap<int,int>updatedKeyframes, QMap<int,int>previousKeyframes);
void updateMaxDuration(int duration);
......
src/timeline2/model/clipmodel.cpp
View file @ b3a4ae10
......@@ -234,6 +234,9 @@ bool ClipModel::requestResize(int size, bool right, Fun &undo, Fun &redo, bool l
}
}
QVector<int> roles{TimelineModel::DurationRole};
if (logUndo) {
roles.push_back(TimelineModel::FinalMoveRole);
}
if (!right) {
roles.push_back(TimelineModel::StartRole);
roles.push_back(TimelineModel::InPointRole);
......
src/timeline2/model/timelinemodel.hpp
View file @ b3a4ae10
......@@ -134,6 +134,7 @@ public:
TypeRole, /// clip only
KeyframesRole,
DurationRole,
FinalMoveRole,
MaxDurationRole,
InPointRole, /// clip only
OutPointRole, /// clip only
......
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