X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=07878af299d7df5c41f776fbbee05167c310f351;hb=c2031b18ba7680d505db3fa978cd4c2812df840c;hp=612656758a721711b95d3fd3fe4077f4fe7effe1;hpb=593c46dd843608c9b800b0ee9f2ad0dc0c69f5a7;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 61265675..07878af2 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -27,6 +27,9 @@ #include "kdenlivesettings.h" #include "kthumb.h" #include "profilesdialog.h" +#ifdef QJSON +#include "rotoscoping/rotowidget.h" +#endif #include #include @@ -57,21 +60,24 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i m_framePixelWidth(0) { setZValue(2); - setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2)); - setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1); + setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double) itemHeight()); + setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1 + itemOffset()); // set speed independant info + if (m_speed <= 0 && m_speed > -1) + m_speed = -1.0; m_speedIndependantInfo = m_info; - m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); - m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps); m_videoPix = KIcon("kdenlive-show-video").pixmap(QSize(16, 16)); m_audioPix = KIcon("kdenlive-show-audio").pixmap(QSize(16, 16)); - if (m_speed == 1.0) m_clipName = m_clip->name(); - else { + if (m_speed == 1.0) + m_clipName = m_clip->name(); + else m_clipName = m_clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%'; - } + m_producer = m_clip->getId(); m_clipType = m_clip->clipType(); //m_cropStart = info.cropStart; @@ -90,7 +96,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i m_endThumbTimer.setSingleShot(true); connect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); - connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int))); + connect(this, SIGNAL(getThumb(int, int)), m_clip, SLOT(slotExtractImage(int, int))); connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); @@ -104,7 +110,7 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i } else if (m_clipType == IMAGE || m_clipType == TEXT) { m_baseColor = QColor(141, 166, 215); if (m_clipType == TEXT) { - connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int))); + connect(this, SIGNAL(getThumb(int, int)), m_clip, SLOT(slotExtractImage(int, int))); connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); } //m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); @@ -138,6 +144,7 @@ ClipItem *ClipItem::clone(ItemInfo info) const duplicate->setEffectList(m_effectList); duplicate->setVideoOnly(m_videoOnly); duplicate->setAudioOnly(m_audioOnly); + duplicate->setFades(fadeIn(), fadeOut()); //duplicate->setSpeed(m_speed); return duplicate; } @@ -146,7 +153,61 @@ void ClipItem::setEffectList(const EffectsList effectList) { m_effectList.clone(effectList); m_effectNames = m_effectList.effectNames().join(" / "); - if (!m_effectList.isEmpty()) setSelectedEffect(0); + if (!m_effectList.isEmpty()) { + for (int i = 0; i < m_effectList.count(); i++) { + QString effectId = m_effectList.item(i).attribute("id"); + // check if it is a fade effect + QDomNodeList params = m_effectList.item(i).elementsByTagName("parameter"); + int fade = 0; + for (int j = 0; j < params.count(); j++) { + QDomElement e = params.item(j).toElement(); + if (!e.isNull()) { + if (effectId == "fadein") { + if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) { + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); + } else { + QDomElement fadein = m_effectList.getEffectByTag(QString(), "fade_from_black"); + if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt(); + else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt(); + } + } else if (effectId == "fade_from_black") { + if (m_effectList.hasEffect(QString(), "fadein") == -1) { + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); + } else { + QDomElement fadein = m_effectList.getEffectByTag(QString(), "fadein"); + if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt(); + else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt(); + } + } else if (effectId == "fadeout") { + if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) { + if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + } else { + QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fade_to_black"); + if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt(); + else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt(); + } + } else if (effectId == "fade_to_black") { + if (m_effectList.hasEffect(QString(), "fadeout") == -1) { + if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + } else { + QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout"); + if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt(); + else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt(); + } + } + } + } + if (fade > 0) + m_startFade = fade; + else if (fade < 0) + m_endFade = -fade; + } + setSelectedEffect(0); + } } const EffectsList ClipItem::effectList() const @@ -174,7 +235,9 @@ void ClipItem::initEffect(QDomElement effect, int diff) QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - kDebug() << "// init eff: " << e.attribute("name"); + + if (e.isNull()) + continue; // Check if this effect has a variable parameter if (e.attribute("default").startsWith('%')) { @@ -185,19 +248,20 @@ void ClipItem::initEffect(QDomElement effect, int diff) } } - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { - QString def = e.attribute("default"); + 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 - if (e.attribute("keyframes").isEmpty()) { - e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + def + ';' + QString::number((cropStart() + cropDuration()).frames(m_fps) - 1) + ':' + def); - kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); - //break; - } + e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default")); } } 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) { @@ -255,9 +319,14 @@ void ClipItem::initEffect(QDomElement effect, int diff) 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; @@ -266,6 +335,8 @@ bool ClipItem::checkKeyFrames() 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(); @@ -301,30 +372,38 @@ bool ClipItem::checkKeyFrames() 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) { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") { + e.setAttribute("keyframes", keyframes.at(keyframeParams)); + if (ix == m_selectedEffect && keyframeParams == 0) { m_keyframes.clear(); + m_visibleParam = i; double max = e.attribute("max").toDouble(); double min = e.attribute("min").toDouble(); m_keyframeFactor = 100.0 / (max - min); + m_keyframeOffset = min; m_keyframeDefault = e.attribute("default").toDouble(); m_selectedKeyframe = 0; // parse keyframes @@ -337,9 +416,8 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) 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; } } } @@ -349,50 +427,51 @@ void ClipItem::setSelectedEffect(const int ix) { m_selectedEffect = ix; QDomElement effect = effectAt(m_selectedEffect); - if (effect.isNull() == false) { + if (!effect.isNull() && effect.attribute("disable") != "1") { QDomNodeList params = effect.elementsByTagName("parameter"); - if (effect.attribute("disable") != "1") - 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")) { - m_keyframes.clear(); - double max = e.attribute("max").toDouble(); - double min = e.attribute("min").toDouble(); - m_keyframeFactor = 100.0 / (max - min); - m_keyframeDefault = e.attribute("default").toDouble(); - m_selectedKeyframe = 0; - - // parse keyframes - const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); - foreach(const QString &str, keyframes) { - int pos = str.section(':', 0, 0).toInt(); - double val = str.section(':', 1, 1).toDouble(); - m_keyframes[pos] = val; - } - if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1; - update(); - return; + 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.attribute("intimeline") == "1") { + m_keyframes.clear(); + m_visibleParam = i; + double max = e.attribute("max").toDouble(); + double min = e.attribute("min").toDouble(); + m_keyframeFactor = 100.0 / (max - min); + m_keyframeOffset = min; + m_keyframeDefault = e.attribute("default").toDouble(); + m_selectedKeyframe = 0; + + // parse keyframes + const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); + foreach(const QString &str, keyframes) { + int pos = str.section(':', 0, 0).toInt(); + double val = str.section(':', 1, 1).toDouble(); + m_keyframes[pos] = val; } + if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) + m_editedKeyframe = -1; + update(); + return; } + } } + if (!m_keyframes.isEmpty()) { m_keyframes.clear(); update(); } } -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; } @@ -403,23 +482,19 @@ void ClipItem::updateKeyframeEffect() QDomElement effect = getEffectAt(m_selectedEffect); if (effect.attribute("disable") == "1") return; 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")) { - QString keyframes; - if (m_keyframes.count() > 0) { - QMap::const_iterator i = m_keyframes.constBegin(); - while (i != m_keyframes.constEnd()) { - keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); - ++i; - } + QDomElement e = params.item(m_visibleParam).toElement(); + + if (!e.isNull()) { + QString keyframes; + if (m_keyframes.count() > 0) { + QMap::const_iterator i = m_keyframes.constBegin(); + while (i != m_keyframes.constEnd()) { + keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); + ++i; } - // Effect has a keyframe type parameter, we need to set the values - //kDebug() << "::::::::::::::: SETTING EFFECT KEYFRAMES: " << keyframes; - e.setAttribute("keyframes", keyframes); - break; } + // Effect has a keyframe type parameter, we need to set the values + e.setAttribute("keyframes", keyframes); } } @@ -440,7 +515,7 @@ void ClipItem::resetThumbs(bool clearExistingThumbs) } -void ClipItem::refreshClip(bool checkDuration) +void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs) { if (checkDuration && (m_maxDuration != m_clip->maxDuration())) { m_maxDuration = m_clip->maxDuration(); @@ -450,11 +525,10 @@ void ClipItem::refreshClip(bool checkDuration) 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(); } } } @@ -462,7 +536,8 @@ void ClipItem::refreshClip(bool checkDuration) QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); m_baseColor = QColor(colour.left(7)); - } else resetThumbs(checkDuration); + update(); + } else resetThumbs(forceResetThumbs); } void ClipItem::slotFetchThumbs() @@ -591,6 +666,11 @@ DocClipBase *ClipItem::baseClip() const } QDomElement ClipItem::xml() const +{ + return itemXml(); +} + +QDomElement ClipItem::itemXml() const { QDomElement xml = m_clip->toXML(); if (m_speed != 1.0) xml.setAttribute("speed", m_speed); @@ -676,6 +756,12 @@ void ClipItem::paint(QPainter *painter, QLineF l2(mapped.left() + m_startPix.width(), mapped.top(), mapped.left() + m_startPix.width(), mapped.bottom()); painter->drawLine(l2); } + if (painter->matrix().m11() == FRAME_SIZE) { + int offset = (m_info.startPos - m_info.cropStart).frames(m_fps); + int left = qMax((int) m_info.startPos.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x()); + int right = qMin((int)(m_info.startPos + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x()); + doGetIntraThumbs(painter, mapped.topLeft(), m_info.cropStart.frames(m_fps), left - offset, right - offset); + } painter->setPen(Qt::black); } @@ -708,6 +794,7 @@ void ClipItem::paint(QPainter *painter, const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; cropLeft = cropLeft * scale; + if (channels >= 1) { emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels); } @@ -775,7 +862,7 @@ void ClipItem::paint(QPainter *painter, pen.setStyle(Qt::DotLine); for (; it != markers.end(); ++it) { - pos = GenTime((int)((*it).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + pos = GenTime((int)((*it).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom()); @@ -866,39 +953,27 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) if (rect.height() < 30) addtransitionOffset = 0; if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { - if (m_startFade == 0) setToolTip(i18n("Add audio fade")); - // xgettext:no-c-format - else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_startFade, m_fps).seconds())); return FADEIN; } else if (pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) { - // xgettext:no-c-format - setToolTip(i18n("Crop from start: %1s", cropStart().seconds())); return RESIZESTART; } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { - if (m_endFade == 0) setToolTip(i18n("Add audio fade")); - // xgettext:no-c-format - else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_endFade, m_fps).seconds())); return FADEOUT; } else if ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) { - // xgettext:no-c-format - setToolTip(i18n("Clip duration: %1s", cropDuration().seconds())); return RESIZEEND; } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { - setToolTip(i18n("Add transition")); return TRANSITIONSTART; } else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { - setToolTip(i18n("Add transition")); return TRANSITIONEND; } - QString tooltip = "" + m_clipName + ""; - if (!baseClip()->fileURL().isEmpty()) - tooltip.append("
" + baseClip()->fileURL().path()); - if (!baseClip()->description().isEmpty()) - tooltip.append("
" + baseClip()->description()); - setToolTip(tooltip); + return MOVE; } +int ClipItem::itemHeight() +{ + return KdenliveSettings::trackheight() - 2; +} + QList ClipItem::snapMarkers() const { QList < GenTime > snaps; @@ -906,8 +981,7 @@ QList ClipItem::snapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - - pos = GenTime((int)(markers.at(i).frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + pos = GenTime((int)(markers.at(i).frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; else snaps.append(pos + startPos()); @@ -923,7 +997,7 @@ QList ClipItem::commentedSnapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - pos = GenTime((int)(markers.at(i).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + pos = GenTime((int)(markers.at(i).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment())); @@ -1032,25 +1106,27 @@ void ClipItem::setFadeIn(int pos) { if (pos == m_startFade) return; int oldIn = m_startFade; - if (pos < 0) pos = 0; - if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps)); - m_startFade = pos; + m_startFade = qBound(0, pos, (int)cropDuration().frames(m_fps)); QRectF rect = boundingRect(); - update(rect.x(), rect.y(), qMax(oldIn, pos), rect.height()); + update(rect.x(), rect.y(), qMax(oldIn, m_startFade), rect.height()); } void ClipItem::setFadeOut(int pos) { if (pos == m_endFade) return; int oldOut = m_endFade; - if (pos < 0) pos = 0; - if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps)); - m_endFade = pos; + m_endFade = qBound(0, pos, (int)cropDuration().frames(m_fps)); QRectF rect = boundingRect(); - update(rect.x() + rect.width() - qMax(oldOut, pos), rect.y(), qMax(oldOut, pos), rect.height()); + update(rect.x() + rect.width() - qMax(oldOut, m_endFade), rect.y(), qMax(oldOut, m_endFade), rect.height()); } +void ClipItem::setFades(int in, int out) +{ + m_startFade = in; + m_endFade = out; +} + /* //virtual void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) @@ -1081,18 +1157,23 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) } */ -void ClipItem::resizeStart(int posx) +void ClipItem::resizeStart(int posx, bool /*size*/) { - const int min = (startPos() - cropStart()).frames(m_fps); - if (posx < min) posx = min; + bool sizeLimit = false; + if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) { + const int min = (startPos() - cropStart()).frames(m_fps); + if (posx < min) posx = min; + sizeLimit = true; + } + if (posx == startPos().frames(m_fps)) return; const int previous = cropStart().frames(m_fps); - AbstractClipItem::resizeStart(posx); + AbstractClipItem::resizeStart(posx, sizeLimit); // set speed independant info m_speedIndependantInfo = m_info; - m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); - m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps); if ((int) cropStart().frames(m_fps) != previous) { if (m_hasThumbs && KdenliveSettings::videothumbnails()) { @@ -1112,8 +1193,8 @@ void ClipItem::resizeEnd(int posx) // set speed independant info m_speedIndependantInfo = m_info; - m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); - m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps); if ((int) cropDuration().frames(m_fps) != previous) { if (m_hasThumbs && KdenliveSettings::videothumbnails()) { @@ -1122,51 +1203,6 @@ void ClipItem::resizeEnd(int posx) } } - -bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) -{ - bool modified = 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")) { - // parse keyframes and adjust values - const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); - QMap 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) { - kfr[current] = val; - modified = true; - } else { - if ((fromStart && pos >= current) || (!fromStart && pos <= current)) { - kfr[pos] = val; - modified = true; - } - } - } - if (modified) { - QString newkfr; - QMap::const_iterator k = kfr.constBegin(); - while (k != kfr.constEnd()) { - newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';'); - ++k; - } - e.setAttribute("keyframes", newkfr); - break; - } - } - } - } - if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); - return modified; -} - //virtual QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) { @@ -1322,11 +1358,16 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat 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") { + parameters.addParam("in", QString::number(cropStart().frames(m_fps))); + parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps))); + } + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; for (int i = 0; i < params.count(); i++) { @@ -1337,8 +1378,8 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat 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); } } @@ -1426,70 +1467,6 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat 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; @@ -1544,17 +1521,19 @@ int ClipItem::strobe() const void ClipItem::setSpeed(const double speed, const int strobe) { m_speed = speed; + if (m_speed <= 0 && m_speed > -1) + m_speed = -1.0; m_strobe = strobe; if (m_speed == 1.0) m_clipName = baseClip()->name(); else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; - m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / m_speed + 0.5), m_fps); - m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / m_speed + 0.5), m_fps); + m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); + m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); //update(); } GenTime ClipItem::maxDuration() const { - return GenTime((int)(m_maxDuration.frames(m_fps) / m_speed + 0.5), m_fps); + return GenTime((int)(m_maxDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); } GenTime ClipItem::speedIndependantCropStart() const @@ -1576,7 +1555,7 @@ const ItemInfo ClipItem::speedIndependantInfo() const //virtual void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { - const QString effects = QString(event->mimeData()->data("kdenlive/effectslist")); + const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist")); QDomDocument doc; doc.setContent(effects, true); const QDomElement e = doc.documentElement(); @@ -1596,7 +1575,7 @@ void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) } void ClipItem::addTransition(Transition* t) @@ -1646,24 +1625,33 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - QString kfr = e.attribute("keyframes"); - const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); - QStringList newkfr; - bool added = false; - foreach(const QString &str, keyframes) { - int kpos = str.section(':', 0, 0).toInt(); - double newval = str.section(':', 1, 1).toDouble(); - if (kpos < pos) { - newkfr.append(str); - } else if (!added) { - if (i == 0) newkfr.append(QString::number(pos) + ":" + QString::number(val)); - else newkfr.append(QString::number(pos) + ":" + QString::number(newval)); - if (kpos > pos) newkfr.append(str); - added = true; - } else newkfr.append(str); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString kfr = e.attribute("keyframes"); + const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); + QStringList newkfr; + bool added = false; + foreach(const QString &str, keyframes) { + int kpos = str.section(':', 0, 0).toInt(); + double newval = str.section(':', 1, 1).toDouble(); + if (kpos < pos) { + newkfr.append(str); + } else if (!added) { + if (i == m_visibleParam) + newkfr.append(QString::number(pos) + ":" + QString::number(val)); + else + newkfr.append(QString::number(pos) + ":" + QString::number(newval)); + if (kpos > pos) newkfr.append(str); + added = true; + } else newkfr.append(str); + } + if (!added) { + if (i == m_visibleParam) + newkfr.append(QString::number(pos) + ":" + QString::number(val)); + else + newkfr.append(QString::number(pos) + ":" + e.attribute("default")); + } + e.setAttribute("keyframes", newkfr.join(";")); } - if (!added) newkfr.append(QString::number(pos) + ":" + QString::number(val)); - e.setAttribute("keyframes", newkfr.join(";")); } } @@ -1676,20 +1664,24 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double int end = (cropStart() + cropDuration()).frames(m_fps) - 1; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - QString kfr = e.attribute("keyframes"); - const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); - QStringList newkfr; - foreach(const QString &str, keyframes) { - if (str.section(':', 0, 0).toInt() != oldpos) { - newkfr.append(str); - } else if (newpos != -1) { - newpos = qMax(newpos, start); - newpos = qMin(newpos, end); - if (i == 0) newkfr.append(QString::number(newpos) + ":" + QString::number(value)); - else newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString kfr = e.attribute("keyframes"); + const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); + QStringList newkfr; + foreach(const QString &str, keyframes) { + if (str.section(':', 0, 0).toInt() != oldpos) { + newkfr.append(str); + } else if (newpos != -1) { + newpos = qMax(newpos, start); + newpos = qMin(newpos, end); + if (i == m_visibleParam) + newkfr.append(QString::number(newpos) + ":" + QString::number(value)); + else + newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + } } + e.setAttribute("keyframes", newkfr.join(";")); } - e.setAttribute("keyframes", newkfr.join(";")); } updateKeyframes(effect); @@ -1701,7 +1693,11 @@ void ClipItem::updateKeyframes(QDomElement effect) m_keyframes.clear(); // parse keyframes QDomNodeList params = effect.elementsByTagName("parameter"); - QDomElement e = params.item(0).toElement(); + QDomElement e = params.item(m_visibleParam).toElement(); + if (e.attribute("intimeline") != "1") { + setSelectedEffect(m_selectedEffect); + return; + } const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); foreach(const QString &str, keyframes) { int pos = str.section(':', 0, 0).toInt(); @@ -1710,4 +1706,228 @@ void ClipItem::updateKeyframes(QDomElement effect) } if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1; } + +void ClipItem::doGetIntraThumbs(QPainter *painter, const QPointF startPos, int offset, int start, int end) +{ + if (!m_clip->thumbProducer() || clipType() == COLOR) return; + if (scene() && scene()->views().isEmpty()) return; + CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; + if (view == NULL) return; + const int theight = KdenliveSettings::trackheight(); + const int twidth = FRAME_SIZE; + + if (clipType() == IMAGE || clipType() == TEXT) { + for (int i = start; i <= end; i++) + painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), m_startPix); + } + QPixmap p; + for (int i = start; i <= end; i++) { +#if KDE_IS_VERSION(4,5,0) + if (!view->m_pixmapCache->findPixmap(m_clip->fileURL().path() + "%" + QString::number(i), &p)) { + p = m_clip->extractImage(i, twidth, theight); + view->m_pixmapCache->insertPixmap(m_clip->fileURL().path() + "%" + QString::number(i), p); + } +#else + if (!view->m_pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) { + p = m_clip->extractImage(i, twidth, theight); + view->m_pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p); + } +#endif + painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), p); + } +} + +QList ClipItem::updatePanZoom(int width, int height, int cut) +{ + QList 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; +// updateGeometryKeyframes(effect, j, width, height, cut); + } + } + } + + return effectPositions; +} + +Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) +{ + if (isAudioOnly()) + return m_clip->audioProducer(track); + else if (isVideoOnly()) + return m_clip->videoProducer(); + else + return m_clip->producer(trackSpecific ? track : -1); +} + +QMap ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo) +{ + QMap effects; + for (int i = 0; i < m_effectList.count(); i++) { + QDomElement effect = m_effectList.at(i); + + if (effect.attribute("id").startsWith("fade")) { + QString id = effect.attribute("id"); + int in = EffectsList::parameter(effect, "in").toInt(); + int out = EffectsList::parameter(effect, "out").toInt(); + int clipEnd = (cropStart() + cropDuration()).frames(m_fps); + if (id == "fade_from_black" || id == "fadein") { + if (in != cropStart().frames(m_fps)) { + effects[i] = effect.cloneNode().toElement(); + int diff = in - cropStart().frames(m_fps); + in -= diff; + out -= diff; + EffectsList::setParameter(effect, "in", QString::number(in)); + EffectsList::setParameter(effect, "out", QString::number(out)); + } + if (out > clipEnd) { + if (!effects.contains(i)) + effects[i] = effect.cloneNode().toElement(); + EffectsList::setParameter(effect, "out", QString::number(clipEnd)); + } + if (effects.contains(i)) + setFadeIn(out - in); + } else { + if (out != clipEnd) { + effects[i] = effect.cloneNode().toElement(); + int diff = out - clipEnd; + in -= diff; + out -= diff; + EffectsList::setParameter(effect, "in", QString::number(in)); + EffectsList::setParameter(effect, "out", QString::number(out)); + } + if (in < cropStart().frames(m_fps)) { + if (!effects.contains(i)) + effects[i] = effect.cloneNode().toElement(); + EffectsList::setParameter(effect, "in", QString::number(cropStart().frames(m_fps))); + } + if (effects.contains(i)) + setFadeOut(out - in); + } + continue; + } else if (effect.attribute("id") == "freeze" && cropStart() != oldInfo.cropStart) { + effects[i] = effect.cloneNode().toElement(); + int diff = (oldInfo.cropStart - cropStart()).frames(m_fps); + int frame = EffectsList::parameter(effect, "frame").toInt(); + EffectsList::setParameter(effect, "frame", QString::number(frame - diff)); + continue; + } + + QDomNodeList params = effect.elementsByTagName("parameter"); + for (int j = 0; j < params.count(); j++) { + QDomElement param = params.item(j).toElement(); + + QString type = param.attribute("type"); + if (type == "geometry" && !param.hasAttribute("fixed")) { + if (!effects.contains(i)) + effects[i] = effect.cloneNode().toElement(); + updateGeometryKeyframes(effect, j, width, height, oldInfo); + } else if (type == "simplekeyframe" || type == "keyframe") { + if (!effects.contains(i)) + effects[i] = effect.cloneNode().toElement(); + updateNormalKeyframes(param); +#ifdef QJSON + } else if (type == "roto-spline") { + if (!effects.contains(i)) + effects[i] = effect.cloneNode().toElement(); + QString value = param.attribute("value"); + if (adjustRotoDuration(&value, cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1)) + param.setAttribute("value", value); +#endif + } + } + } + return effects; +} + +bool ClipItem::updateNormalKeyframes(QDomElement parameter) +{ + int in = cropStart().frames(m_fps); + int out = (cropStart() + cropDuration()).frames(m_fps) - 1; + + const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts); + QMap keyframes; + foreach (QString keyframe, data) + keyframes[keyframe.section(':', 0, 0).toInt()] = keyframe.section(':', 1, 1).toDouble(); + + + QMap::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 (startFound || endFound) { + QString newkfr; + QMap::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 false; +} + +void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo) +{ + QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement(); + + Mlt::Geometry geometry(param.attribute("value").toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height); + + param.setAttribute("value", geometry.serialise(cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1)); +} + #include "clipitem.moc"