X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=086aa7c6108a32d9a310d974bd30ea54808ce195;hb=ecd0a9c034e30229acf06bbef2d3d1b88c58b21a;hp=b2de6e57a86edb7078f145cfaf907e3ef83ba812;hpb=5143c0fd6b774ee8a036427bb1630126270a6364;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index b2de6e57..086aa7c6 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -27,6 +27,9 @@ #include "kdenlivesettings.h" #include "kthumb.h" #include "profilesdialog.h" +#ifdef USE_QJSON +#include "rotoscoping/rotowidget.h" +#endif #include #include @@ -37,7 +40,9 @@ #include #include -ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, bool generateThumbs) : +static int FRAME_SIZE; + +ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_startFade(0), @@ -54,24 +59,29 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i //m_hover(false), m_speed(speed), m_strobe(strobe), - m_framePixelWidth(0) + m_framePixelWidth(0), + m_limitedKeyFrames(false) { 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); + FRAME_SIZE = frame_width; + 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; @@ -89,9 +99,6 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i 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(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())); @@ -104,7 +111,6 @@ 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(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()); @@ -128,11 +134,13 @@ ClipItem::~ClipItem() ClipItem *ClipItem::clone(ItemInfo info) const { - ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe); + ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe, FRAME_SIZE); if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix); else if (m_clipType != COLOR) { if (info.cropStart == m_info.cropStart) duplicate->slotSetStartThumb(m_startPix); - if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + (m_info.endPos - m_info.startPos)) duplicate->slotSetEndThumb(m_endPix); + if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + m_info.cropDuration) { + duplicate->slotSetEndThumb(m_endPix); + } } //kDebug() << "// CLoning clip: " << (info.cropStart + (info.endPos - info.startPos)).frames(m_fps) << ", CURRENT end: " << (cropStart() + duration()).frames(m_fps); duplicate->setEffectList(m_effectList); @@ -195,8 +203,10 @@ void ClipItem::setEffectList(const EffectsList effectList) } } } - if (fade > 0) m_startFade = fade; - else if (fade < 0) m_endFade = -fade; + if (fade > 0) + m_startFade = fade; + else if (fade < 0) + m_endFade = -fade; } setSelectedEffect(0); } @@ -227,10 +237,12 @@ 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('%')) { + if (e.attribute("default").contains('%')) { double evaluatedValue = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("default")); e.setAttribute("default", evaluatedValue); if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) { @@ -238,19 +250,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) { @@ -308,9 +321,15 @@ 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()) { + QLocale locale; + // 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; @@ -319,9 +338,11 @@ 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(); + double val = locale.toDouble(str.section(':', 1, 1)); if (pos - start < 0) { // a keyframe is defined before the start of the clip cutKeyFrame = true; @@ -331,7 +352,7 @@ bool ClipItem::checkKeyFrames() int diff = pos - lastPos; double ratio = (double)(start - lastPos) / diff; double newValue = lastValue + (val - lastValue) * ratio; - newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue)); + newKeyFrames.append(QString::number(start) + ':' + locale.toString(newValue)); modified = true; } cutKeyFrame = false; @@ -343,56 +364,64 @@ bool ClipItem::checkKeyFrames() if (diff != 0) { double ratio = (double)(end - lastPos) / diff; double newValue = lastValue + (val - lastValue) * ratio; - newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue)); + newKeyFrames.append(QString::number(end) + ':' + locale.toString(newValue)); modified = true; } break; } else { - newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); + newKeyFrames.append(QString::number(pos) + ':' + locale.toString(val)); } } 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; + QLocale locale; 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(); - double max = e.attribute("max").toDouble(); - double min = e.attribute("min").toDouble(); + m_visibleParam = i; + double max = locale.toDouble(e.attribute("max")); + double min = locale.toDouble(e.attribute("min")); m_keyframeFactor = 100.0 / (max - min); - m_keyframeDefault = e.attribute("default").toDouble(); + m_keyframeOffset = min; + m_keyframeDefault = locale.toDouble(e.attribute("default")); 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(); + double val = locale.toDouble(str.section(':', 1, 1)); 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; } } } @@ -401,51 +430,54 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) void ClipItem::setSelectedEffect(const int ix) { m_selectedEffect = ix; + QLocale locale; 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_limitedKeyFrames = e.attribute("type") == "keyframe"; + m_visibleParam = i; + double max = locale.toDouble(e.attribute("max")); + double min = locale.toDouble(e.attribute("min")); + m_keyframeFactor = 100.0 / (max - min); + m_keyframeOffset = min; + m_keyframeDefault = locale.toDouble(e.attribute("default")); + 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 = locale.toDouble(str.section(':', 1, 1)); + 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; } @@ -456,23 +488,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); } } @@ -493,7 +521,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(); @@ -503,11 +531,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(); } } } @@ -515,7 +542,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() @@ -534,30 +562,30 @@ void ClipItem::slotFetchThumbs() return; } - if (m_endPix.isNull() && m_startPix.isNull()) { + QList frames; + if (m_startPix.isNull()) { m_startThumbRequested = true; + frames.append((int)m_speedIndependantInfo.cropStart.frames(m_fps)); + } + + if (m_endPix.isNull()) { m_endThumbRequested = true; - emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); - } else { - if (m_endPix.isNull()) { - slotGetEndThumb(); - } - if (m_startPix.isNull()) { - slotGetStartThumb(); - } + frames.append((int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); } + + if (!frames.isEmpty()) m_clip->slotExtractImage(frames); } void ClipItem::slotGetStartThumb() { m_startThumbRequested = true; - emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), -1); + m_clip->slotExtractImage(QList() << (int)m_speedIndependantInfo.cropStart.frames(m_fps)); } void ClipItem::slotGetEndThumb() { m_endThumbRequested = true; - emit getThumb(-1, (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); + m_clip->slotExtractImage(QList() << (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); } @@ -645,12 +673,7 @@ DocClipBase *ClipItem::baseClip() const QDomElement ClipItem::xml() const { - QDomElement xml = m_clip->toXML(); - if (m_speed != 1.0) xml.setAttribute("speed", m_speed); - if (m_strobe > 1) xml.setAttribute("strobe", m_strobe); - if (m_audioOnly) xml.setAttribute("audio_only", 1); - else if (m_videoOnly) xml.setAttribute("video_only", 1); - return xml; + return itemXml(); } QDomElement ClipItem::itemXml() const @@ -708,16 +731,23 @@ void ClipItem::paint(QPainter *painter, QWidget *) { QColor paintColor; + QPen framePen; if (parentItem()) paintColor = QColor(255, 248, 149); else paintColor = m_baseColor; - if (isSelected() || (parentItem() && parentItem()->isSelected())) paintColor = paintColor.darker(); + if (isSelected() || (parentItem() && parentItem()->isSelected())) { + paintColor = paintColor.darker(); + framePen.setColor(Qt::red); + framePen.setWidthF(2.0); + } + else { + framePen.setColor(paintColor.darker()); + } - painter->setMatrixEnabled(false); - const QRectF mapped = painter->matrix().mapRect(rect()).adjusted(0.5, 0, 0.5, 0); const QRectF exposed = option->exposedRect; - painter->setClipRect(mapped); - painter->fillRect(mapped, paintColor); - + painter->setClipRect(exposed); + painter->fillRect(exposed, paintColor); + painter->setWorldMatrixEnabled(false);; + const QRectF mapped = painter->worldTransform().mapRect(rect()); // draw thumbnails if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { QPen pen = painter->pen(); @@ -739,6 +769,43 @@ 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 we are in full zoom, paint thumbnail for every frame + if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && painter->worldTransform().m11() == FRAME_SIZE) { + int offset = (m_info.startPos - m_info.cropStart).frames(m_fps); + int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset); + int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset); + QPointF startPos = mapped.topLeft(); + int startOffset = m_info.cropStart.frames(m_fps); + if (clipType() == IMAGE || clipType() == TEXT) { + for (int i = left; i <= right; i++) { + painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix); + } + } + else { +#if KDE_IS_VERSION(4,5,0) + if (m_clip && m_clip->thumbProducer()) { + QString path = m_clip->fileURL().path() + "_"; + QImage img; + QPen pen(Qt::white); + pen.setStyle(Qt::DotLine); + painter->setPen(pen); + QList missing; + for (int i = left; i <= right; i++) { + img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)); + QPointF xpos = startPos + QPointF(FRAME_SIZE *(i - startOffset), 0); + if (img.isNull()) missing << i; + else painter->drawImage(xpos, img); + painter->drawLine(xpos, xpos + QPointF(0, mapped.height())); + } + if (!missing.isEmpty()) { + m_clip->thumbProducer()->queryIntraThumbs(missing); + connect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache())); + } + } +#endif + } + } painter->setPen(Qt::black); } @@ -760,15 +827,15 @@ void ClipItem::paint(QPainter *painter, mappedRect.setTop(mappedRect.bottom() - mapped.height() / 2); } else mappedRect = mapped; - double scale = painter->matrix().m11(); + double scale = painter->worldTransform().m11(); 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); const int clipStart = mappedRect.x(); - const int mappedStartPixel = painter->matrix().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart; - const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; + const int mappedStartPixel = painter->worldTransform().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart; + const int mappedEndPixel = painter->worldTransform().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; cropLeft = cropLeft * scale; if (channels >= 1) { @@ -781,133 +848,129 @@ void ClipItem::paint(QPainter *painter, } } - // Draw effects names - if (!m_effectNames.isEmpty() && mapped.width() > 40) { - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); - QColor bgColor; - if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { - qreal value = m_timeLine->currentValue(); - txtBounding.setWidth(txtBounding.width() * value); - bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); - } else bgColor.setRgb(50, 50, 90, 180); - - QPainterPath rounded; - rounded.moveTo(txtBounding.bottomRight()); - rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); - rounded.lineTo(txtBounding.topLeft()); - rounded.lineTo(txtBounding.bottomLeft()); - painter->fillPath(rounded, bgColor); - painter->setPen(Qt::lightGray); - painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); - } - - // Draw clip name - QColor frameColor(paintColor.darker()); - if (isSelected() || (parentItem() && parentItem()->isSelected())) { - frameColor = QColor(Qt::red); - } - frameColor.setAlpha(160); - - const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); - //painter->fillRect(txtBounding2, frameColor); - painter->setBrush(frameColor); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding2, 3, 3); - painter->setBrush(QBrush(Qt::NoBrush)); - - //painter->setPen(QColor(0, 0, 0, 180)); - //painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); - if (m_videoOnly) { - painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); - } else if (m_audioOnly) { - painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); - } - painter->setPen(Qt::white); - painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + // only paint details if clip is big enough + if (mapped.width() > 20) { + + // Draw effects names + if (!m_effectNames.isEmpty() && mapped.width() > 40) { + QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); + QColor bgColor; + if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { + qreal value = m_timeLine->currentValue(); + txtBounding.setWidth(txtBounding.width() * value); + bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); + } else bgColor.setRgb(50, 50, 90, 180); + + QPainterPath rounded; + rounded.moveTo(txtBounding.bottomRight()); + rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); + rounded.lineTo(txtBounding.topLeft()); + rounded.lineTo(txtBounding.bottomLeft()); + painter->fillPath(rounded, bgColor); + painter->setPen(Qt::lightGray); + painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); + } + const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); + painter->setBrush(framePen.color()); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding2, 3, 3); + painter->setBrush(QBrush(Qt::NoBrush)); - // draw markers - 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) / 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()); + if (m_videoOnly) { + painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); + } else if (m_audioOnly) { + painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); + } + painter->setPen(Qt::white); + painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + + + // draw markers + 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->worldTransform().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->worldTransform().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))); } } - } - - // draw start / end fades - QBrush fades; - if (isSelected()) { - fades = QBrush(QColor(200, 50, 50, 150)); - } else fades = QBrush(QColor(200, 200, 200, 200)); - - if (m_startFade != 0) { - QPainterPath fadeInPath; - fadeInPath.moveTo(0, 0); - fadeInPath.lineTo(0, rect().height()); - fadeInPath.lineTo(m_startFade, 0); - fadeInPath.closeSubpath(); - QPainterPath f1 = painter->matrix().map(fadeInPath); - painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); - /*if (isSelected()) { - QLineF l(m_startFade * scale, 0, 0, itemHeight); - painter->drawLine(l); - }*/ - } - if (m_endFade != 0) { - QPainterPath fadeOutPath; - fadeOutPath.moveTo(rect().width(), 0); - fadeOutPath.lineTo(rect().width(), rect().height()); - fadeOutPath.lineTo(rect().width() - m_endFade, 0); - fadeOutPath.closeSubpath(); - QPainterPath f1 = painter->matrix().map(fadeOutPath); - painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); - /*if (isSelected()) { - QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight); - painter->drawLine(l); - }*/ - } - - painter->setPen(QPen(Qt::lightGray)); - // draw effect or transition keyframes - if (mapped.width() > 20) drawKeyFrames(painter, exposed); + // draw start / end fades + QBrush fades; + if (isSelected()) { + fades = QBrush(QColor(200, 50, 50, 150)); + } else fades = QBrush(QColor(200, 200, 200, 200)); + + if (m_startFade != 0) { + QPainterPath fadeInPath; + fadeInPath.moveTo(0, 0); + fadeInPath.lineTo(0, rect().height()); + fadeInPath.lineTo(m_startFade, 0); + fadeInPath.closeSubpath(); + QPainterPath f1 = painter->worldTransform().map(fadeInPath); + painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); + /*if (isSelected()) { + QLineF l(m_startFade * scale, 0, 0, itemHeight); + painter->drawLine(l); + }*/ + } + if (m_endFade != 0) { + QPainterPath fadeOutPath; + fadeOutPath.moveTo(rect().width(), 0); + fadeOutPath.lineTo(rect().width(), rect().height()); + fadeOutPath.lineTo(rect().width() - m_endFade, 0); + fadeOutPath.closeSubpath(); + QPainterPath f1 = painter->worldTransform().map(fadeOutPath); + painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); + /*if (isSelected()) { + QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight); + painter->drawLine(l); + }*/ + } - //painter->setMatrixEnabled(true); + painter->setPen(QPen(Qt::lightGray)); + // draw effect or transition keyframes + drawKeyFrames(painter, m_limitedKeyFrames); + } + // draw clip border // expand clip rect to allow correct painting of clip border - QPen pen1(frameColor); - painter->setPen(pen1); painter->setClipping(false); - painter->drawRect(painter->matrix().mapRect(rect())); + painter->setPen(framePen); + if (isSelected() || (parentItem() && parentItem()->isSelected())) { + painter->drawRect(mapped.adjusted(0.5, 0.5, -0.5, -0.5)); + } + else { + painter->drawRect(mapped.adjusted(0, 0, -0.5, 0)); + } } @@ -929,39 +992,33 @@ 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; +} + +void ClipItem::resetFrameWidth(int width) +{ + FRAME_SIZE = width; + update(); +} + QList ClipItem::snapMarkers() const { QList < GenTime > snaps; @@ -969,8 +1026,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()); @@ -986,7 +1042,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())); @@ -1095,22 +1151,18 @@ 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()); } @@ -1150,7 +1202,7 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) } */ -void ClipItem::resizeStart(int posx, bool) +void ClipItem::resizeStart(int posx, bool /*size*/) { bool sizeLimit = false; if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) { @@ -1165,8 +1217,8 @@ void ClipItem::resizeStart(int posx, bool) // 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()) { @@ -1186,8 +1238,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()) { @@ -1196,51 +1248,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) { @@ -1378,6 +1385,7 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animate*/) { bool needRepaint = false; + QLocale locale; int ix; if (!effect.hasAttribute("kdenlive_ix")) { ix = effectsCounter(); @@ -1396,24 +1404,31 @@ 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 + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; + bool needInOutSync = false; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { + if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { + // Effects with a geometry parameter need to sync in / out with parent clip + needInOutSync = true; + } if (e.attribute("type") == "simplekeyframe") { QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); - double factor = e.attribute("factor", "1").toDouble(); - if (factor != 1) { + double factor = locale.toDouble(e.attribute("factor", "1")); + double offset = e.attribute("offset", "0").toDouble(); + if (factor != 1 || offset != 0) { 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); + QString pos = values.at(j).section(':', 0, 0); + double val = (locale.toDouble(values.at(j).section(':', 1, 1)) - offset) / factor; + values[j] = pos + "=" + locale.toString(val); } } parameters.addParam(e.attribute("name"), values.join(";")); @@ -1425,9 +1440,10 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat parameters.addParam("max", e.attribute("max")); parameters.addParam("min", e.attribute("min")); parameters.addParam("factor", e.attribute("factor", "1")); + parameters.addParam("offset", e.attribute("offset", "0")); parameters.addParam("starttag", e.attribute("starttag", "start")); parameters.addParam("endtag", e.attribute("endtag", "end")); - } else if (e.attribute("factor", "1") == "1") { + } else if (e.attribute("factor", "1") == "1" && e.attribute("offset", "0") == "0") { parameters.addParam(e.attribute("name"), e.attribute("value")); // check if it is a fade effect @@ -1474,13 +1490,21 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat } } else { double fact; - if (e.attribute("factor").startsWith('%')) { + if (e.attribute("factor").contains('%')) { 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 { + fact = locale.toDouble(e.attribute("factor", "1")); + } + double offset = e.attribute("offset", "0").toDouble(); + parameters.addParam(e.attribute("name"), locale.toString((locale.toDouble(e.attribute("value")) - offset) / fact)); } } } + if (needInOutSync) { + parameters.addParam("in", QString::number(cropStart().frames(m_fps))); + parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1)); + parameters.addParam("_sync_in_out", "1"); + } m_effectNames = m_effectList.effectNames().join(" / "); if (fade > 0) m_startFade = fade; else if (fade < 0) m_endFade = -fade; @@ -1500,70 +1524,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; @@ -1618,17 +1578,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 @@ -1650,7 +1612,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(); @@ -1670,7 +1632,7 @@ void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) { - Q_UNUSED(event); + Q_UNUSED(event) } void ClipItem::addTransition(Transition* t) @@ -1715,55 +1677,70 @@ bool ClipItem::isVideoOnly() const void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) { if (effect.attribute("disable") == "1") return; + QLocale locale; 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 (!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 = locale.toDouble(str.section(':', 1, 1)); + 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) + ":" + locale.toString(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(";")); } } void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double value) { if (effect.attribute("disable") == "1") return; + QLocale locale; 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)); + 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) + ":" + locale.toString(value)); + else + newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + } } + e.setAttribute("keyframes", newkfr.join(";")); } - e.setAttribute("keyframes", newkfr.join(";")); } updateKeyframes(effect); @@ -1773,15 +1750,216 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double void ClipItem::updateKeyframes(QDomElement effect) { m_keyframes.clear(); + QLocale locale; // 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; + } + m_limitedKeyFrames = e.attribute("type") == "keyframe"; 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(); + double val = locale.toDouble(str.section(':', 1, 1)); m_keyframes[pos] = val; } if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1; } + +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->getProducer(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) - 1; + 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 = qMax(in - diff, (int) cropStart().frames(m_fps)); + 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 USE_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; + QLocale locale; + + const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts); + QMap keyframes; + foreach (QString keyframe, data) + keyframes[keyframe.section(':', 0, 0).toInt()] = locale.toDouble(keyframe.section(':', 1, 1)); + + + 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(); + int offset = oldInfo.cropStart.frames(m_fps); + QString data = param.attribute("value"); + if (offset > 0) { + QStringList kfrs = data.split(';'); + data.clear(); + foreach (QString keyframe, kfrs) { + if (keyframe.contains('=')) { + int pos = keyframe.section('=', 0, 0).toInt(); + pos += offset; + data.append(QString::number(pos) + "=" + keyframe.section('=', 1) + ";"); + } + else data.append(keyframe + ";"); + } + } + Mlt::Geometry geometry(data.toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height); + param.setAttribute("value", geometry.serialise(cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1)); +} + +void ClipItem::slotGotThumbsCache() +{ + disconnect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache())); + update(); +} + #include "clipitem.moc" +