X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=0cd508bb093afead0ce35c38d170d05feb29053f;hb=5bac38471d4c90a8a520d6ec32b90913b6f0dbcb;hp=d9d113fd03299f5b4fbb31dae59a744a0879eca3;hpb=1bb5954abb1179a8cd75a3dbffec0911f297357e;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index d9d113fd..0cd508bb 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -61,9 +61,10 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1); // 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)); @@ -83,17 +84,19 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { m_baseColor = QColor(141, 166, 215); - m_hasThumbs = true; - m_startThumbTimer.setSingleShot(true); - connect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); - m_endThumbTimer.setSingleShot(true); - connect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); + if (!m_clip->isPlaceHolder()) { + m_hasThumbs = true; + m_startThumbTimer.setSingleShot(true); + connect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); + 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->thumbProducer(), SLOT(extractImage(int, int))); - connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); - connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); - if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); + connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); + } } else if (m_clipType == COLOR) { QString colour = m_clip->getProperty("colour"); @@ -118,8 +121,8 @@ ClipItem::~ClipItem() blockSignals(true); if (scene()) scene()->removeItem(this); if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { - disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); - disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + //disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + //disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } delete m_timeLine; } @@ -136,6 +139,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; } @@ -144,7 +148,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 @@ -188,14 +246,14 @@ void ClipItem::initEffect(QDomElement effect, int diff) // 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; + kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); + //break; } } } 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) { @@ -253,9 +311,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; @@ -264,6 +327,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(); @@ -299,31 +364,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("disabled") == "1") return; + if (effect.attribute("disable") == "1") return; QDomNodeList params = effect.elementsByTagName("parameter"); + int keyframeParams = 0; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { - e.setAttribute("keyframes", keyframes); - if (ix == m_selectedEffect) { + e.setAttribute("keyframes", keyframes.at(keyframeParams)); + if (ix == m_selectedEffect && keyframeParams == 0) { m_keyframes.clear(); double max = e.attribute("max").toDouble(); double min = e.attribute("min").toDouble(); 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) { @@ -331,10 +403,11 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) double val = str.section(':', 1, 1).toDouble(); m_keyframes[pos] = val; } + 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; } } } @@ -346,7 +419,7 @@ void ClipItem::setSelectedEffect(const int ix) QDomElement effect = effectAt(m_selectedEffect); if (effect.isNull() == false) { QDomNodeList params = effect.elementsByTagName("parameter"); - if (effect.attribute("disabled") != "1") + 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")) { @@ -355,6 +428,8 @@ void ClipItem::setSelectedEffect(const int ix) 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) { @@ -362,6 +437,7 @@ void ClipItem::setSelectedEffect(const int ix) 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; } @@ -373,18 +449,16 @@ void ClipItem::setSelectedEffect(const int ix) } } -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; } @@ -393,14 +467,14 @@ void ClipItem::updateKeyframeEffect() { // regenerate xml parameter from the clip keyframes QDomElement effect = getEffectAt(m_selectedEffect); - if (effect.attribute("disabled") == "1") return; + 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() > 1) { + 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()) + ';'); @@ -442,11 +516,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(); } } } @@ -583,6 +656,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); @@ -651,7 +729,6 @@ void ClipItem::paint(QPainter *painter, if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { QPen pen = painter->pen(); pen.setColor(QColor(255, 255, 255, 150)); - const QRectF source(0.0, 0.0, (double) m_startPix.width(), (double) m_startPix.height()); painter->setPen(pen); if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); @@ -669,6 +746,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); } @@ -691,7 +774,8 @@ void ClipItem::paint(QPainter *painter, } else mappedRect = mapped; double scale = painter->matrix().m11(); - int channels = baseClip()->getProperty("channels").toInt(); + int channels = 0; + if (isEnabled() && m_clip) channels = m_clip->getProperty("channels").toInt(); if (scale != m_framePixelWidth) m_audioThumbCachePic.clear(); double cropLeft = m_info.cropStart.frames(m_fps); @@ -700,6 +784,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); } @@ -756,38 +841,38 @@ void ClipItem::paint(QPainter *painter, // draw markers - QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); - QList < CommentedTime >::Iterator it = markers.begin(); - GenTime pos; - double framepos; - QBrush markerBrush(QColor(120, 120, 0, 140)); - QPen pen = painter->pen(); - pen.setColor(QColor(255, 255, 255, 200)); - pen.setStyle(Qt::DotLine); - - for (; it != markers.end(); ++it) { - pos = GenTime((int)((*it).time().frames(m_fps) / 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()); - QLineF l2 = painter->matrix().map(l); - //framepos = scale * pos.frames(m_fps); - //QLineF l(framepos, 5, framepos, itemHeight - 5); - painter->setPen(pen); - painter->drawLine(l2); - if (KdenliveSettings::showmarkers()) { - framepos = rect().x() + pos.frames(m_fps); - const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10); - const QRectF r2 = painter->matrix().mapRect(r1); - const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); - painter->setBrush(markerBrush); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding3, 3, 3); - painter->setBrush(QBrush(Qt::NoBrush)); - painter->setPen(Qt::white); - painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment()); + if (isEnabled() && m_clip) { + QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); + QList < CommentedTime >::Iterator it = markers.begin(); + GenTime pos; + double framepos; + QBrush markerBrush(QColor(120, 120, 0, 140)); + QPen pen = painter->pen(); + pen.setColor(QColor(255, 255, 255, 200)); + pen.setStyle(Qt::DotLine); + + for (; it != markers.end(); ++it) { + 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()); + QLineF l2 = painter->matrix().map(l); + painter->setPen(pen); + painter->drawLine(l2); + if (KdenliveSettings::showmarkers()) { + framepos = rect().x() + pos.frames(m_fps); + const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10); + const QRectF r2 = painter->matrix().mapRect(r1); + const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); + painter->setBrush(markerBrush); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding3, 3, 3); + painter->setBrush(QBrush(Qt::NoBrush)); + painter->setPen(Qt::white); + painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment()); + } + //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); } - //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); } } @@ -846,8 +931,11 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) const double scale = projectScene()->scale().x(); double maximumOffset = 6 / scale; if (isSelected() || (parentItem() && parentItem()->isSelected())) { - m_editedKeyframe = mouseOverKeyFrames(pos, maximumOffset); - if (m_editedKeyframe != -1) return KEYFRAME; + int kf = mouseOverKeyFrames(pos, maximumOffset); + if (kf != -1) { + m_editedKeyframe = kf; + return KEYFRAME; + } } QRectF rect = sceneBoundingRect(); int addtransitionOffset = 10; @@ -856,16 +944,20 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) 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)) { @@ -875,7 +967,12 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) setToolTip(i18n("Add transition")); return TRANSITIONEND; } - setToolTip(QString()); + 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; } @@ -886,8 +983,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()); @@ -903,7 +999,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())); @@ -1031,6 +1127,12 @@ void ClipItem::setFadeOut(int pos) } +void ClipItem::setFades(int in, int out) +{ + m_startFade = in; + m_endFade = out; +} + /* //virtual void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) @@ -1061,18 +1163,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()) { @@ -1092,8 +1199,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()) { @@ -1105,13 +1212,16 @@ void ClipItem::resizeEnd(int posx) bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) { - bool modified = false; + bool effModified = false; for (int i = 0; i < m_effectList.count(); i++) { QDomElement effect = m_effectList.at(i); QDomNodeList params = effect.elementsByTagName("parameter"); for (int j = 0; j < params.count(); j++) { - QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + bool modified = false; + QDomElement e = params.item(j).toElement(); + if (e.isNull()) + continue; + if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") { // parse keyframes and adjust values const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); QMap kfr; @@ -1121,16 +1231,19 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b pos = str.section(':', 0, 0).toInt(); val = str.section(':', 1, 1).toDouble(); if (pos == previous) { + // first or last keyframe kfr[current] = val; modified = true; } else { if ((fromStart && pos >= current) || (!fromStart && pos <= current)) { + // only keyframes in range kfr[pos] = val; modified = true; } } } if (modified) { + effModified = true; QString newkfr; QMap::const_iterator k = kfr.constBegin(); while (k != kfr.constEnd()) { @@ -1138,18 +1251,21 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b ++k; } e.setAttribute("keyframes", newkfr); - break; } } } } - if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); - return modified; + if (effModified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); + return effModified; } //virtual QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) { + if (change == QGraphicsItem::ItemSelectedChange) { + if (value.toBool()) setZValue(10); + else setZValue(2); + } if (change == ItemPositionChange && scene()) { // calculate new position. //if (parentItem()) return pos(); @@ -1296,43 +1412,51 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat parameters.addParam("tag", effect.attribute("tag")); parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix")); if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src")); - if (effect.hasAttribute("disabled")) parameters.addParam("disabled", effect.attribute("disabled")); - + if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable")); QString effectId = effect.attribute("id"); if (effectId.isEmpty()) effectId = effect.attribute("tag"); parameters.addParam("id", effectId); + // special case: the affine effect needs in / out points + if (effectId == "pan_zoom") { + int start = cropStart().frames(m_fps); + int end = (cropStart() + cropDuration()).frames(m_fps); + if (start < 0) { + end -= start; + start = 0; + } + parameters.addParam("in", QString::number(start)); + parameters.addParam("out", QString::number(end)); + } + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { - if (e.attribute("type") == "simplekeyframe") { - QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); - 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; - values[j] = pos + "=" + QString::number(val); - } - } + if (e.attribute("type") == "simplekeyframe") { + QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + 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; + values[j] = pos + "=" + QString::number(val); + } + } parameters.addParam(e.attribute("name"), values.join(";")); /*parameters.addParam("max", e.attribute("max")); parameters.addParam("min", e.attribute("min")); parameters.addParam("factor", );*/ - } - else if (e.attribute("type") == "keyframe") { + } else if (e.attribute("type") == "keyframe") { 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")); - } - - if (e.attribute("factor", "1") == "1") { + } else if (e.attribute("factor", "1") == "1") { parameters.addParam(e.attribute("name"), e.attribute("value")); // check if it is a fade effect @@ -1405,72 +1529,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("disabled")) parameters.addParam("disabled", effect.attribute("disabled")); - - 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") { - kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE"; - QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); - 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; - values[j] = pos + "=" + QString::number(val); - } - } - 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; @@ -1525,17 +1583,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 @@ -1619,5 +1679,177 @@ bool ClipItem::isVideoOnly() const return m_videoOnly; } +void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) +{ + if (effect.attribute("disable") == "1") return; + effect.setAttribute("active_keyframe", pos); + m_editedKeyframe = pos; + 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 (!added) newkfr.append(QString::number(pos) + ":" + QString::number(val)); + e.setAttribute("keyframes", newkfr.join(";")); + } +} + +void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double value) +{ + if (effect.attribute("disable") == "1") return; + effect.setAttribute("active_keyframe", newpos); + QDomNodeList params = effect.elementsByTagName("parameter"); + int start = cropStart().frames(m_fps); + 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)); + } + } + e.setAttribute("keyframes", newkfr.join(";")); + } + + updateKeyframes(effect); + update(); +} + +void ClipItem::updateKeyframes(QDomElement effect) +{ + m_keyframes.clear(); + // parse keyframes + QDomNodeList params = effect.elementsByTagName("parameter"); + QDomElement e = params.item(0).toElement(); + 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.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 (!view->pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) { + p = m_clip->thumbProducer()->extractImage(i, twidth, theight); + view->pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p); + } + 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; + + int in = cropStart().frames(fps()); + int out = in + cropDuration().frames(fps()); + if (in < 0) { + out -= in; + in = 0; + } + int dur = out - in - 1; + + effect.setAttribute("in", in); + effect.setAttribute("out", out); + + Mlt::Geometry geometry(e.attribute("value").toUtf8().data(), dur, width, height); + Mlt::GeometryItem item; + bool endFrameAdded = false; + if (cut == 0) { + while (!geometry.next_key(&item, dur)) { + if (!endFrameAdded) { + // add keyframe at the end with interpolated value + + // but only once ;) + endFrameAdded = true; + + Mlt::GeometryItem endItem; + Mlt::GeometryItem interp; + geometry.fetch(&interp, dur - 1); + endItem.frame(dur - 1); + endItem.x(interp.x()); + endItem.y(interp.y()); + endItem.w(interp.w()); + endItem.h(interp.h()); + endItem.mix(interp.mix()); + geometry.insert(&endItem); + } + geometry.remove(item.frame()); + } + } else { + Mlt::Geometry origGeometry(e.attribute("value").toUtf8().data(), dur, width, height); + // remove keyframes before cut point + while (!geometry.prev_key(&item, cut - 1) && item.frame() < cut) + geometry.remove(item.frame()); + + // add a keyframe at new pos 0 + origGeometry.fetch(&item, cut); + item.frame(0); + geometry.insert(&item); + + // move exisiting keyframes by -cut + while (!origGeometry.next_key(&item, cut)) { + geometry.remove(item.frame()); + origGeometry.remove(item.frame()); + item.frame(item.frame() - cut); + geometry.insert(&item); + } + + } + + e.setAttribute("value", geometry.serialise()); + } + } + } + + return effectPositions; +} #include "clipitem.moc"