X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.cpp;h=609f717485d78258bf1a0406662c2fc57fb70994;hb=621ccf919b20718f7f78ca426f410ff040934c0a;hp=e7edc03e8dff879e932bfc926bab92408ad94fd3;hpb=366005de0c5b38e93e3a1f092cc2d54d43cc5707;p=kdenlive diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index e7edc03e..609f7174 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -28,33 +28,50 @@ #include "kdenlivesettings.h" #include "kthumb.h" #include "clipmanager.h" +#include "slideshowclip.h" +#include +#include #include #include +#include + +#include DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) : QObject(), - audioFrameChache(), - m_description(), + m_audioFrameCache(), m_refcount(0), m_baseTrackProducers(), m_audioTrackProducers(), m_videoOnlyProducer(NULL), - m_snapMarkers(), + m_snapMarkers(QList < CommentedTime >()), m_duration(), m_audioTimer(NULL), m_thumbProd(NULL), m_audioThumbCreated(false), m_id(id), + m_placeHolder(xml.hasAttribute("placeholder")), m_properties() { int type = xml.attribute("type").toInt(); m_clipType = (CLIPTYPE) type; - + if (m_placeHolder) xml.removeAttribute("placeholder"); QDomNamedNodeMap attributes = xml.attributes(); - for (unsigned int i = 0; i < attributes.count(); i++) { - m_properties.insert(attributes.item(i).nodeName(), attributes.item(i).nodeValue()); + for (int i = 0; i < attributes.count(); i++) { + QString name = attributes.item(i).nodeName(); + if (name.startsWith("meta.attr.")) { + m_metadata.insert(name.section('.', 2, 3), attributes.item(i).nodeValue()); + } else m_properties.insert(name, attributes.item(i).nodeValue()); + } + + if (xml.hasAttribute("cutzones")) { + QStringList cuts = xml.attribute("cutzones").split(";", QString::SkipEmptyParts); + for (int i = 0; i < cuts.count(); i++) { + QString z = cuts.at(i); + addCutZone(z.section('-', 0, 0).toInt(), z.section('-', 1, 1).toInt(), z.section('-', 2, 2)); + } } KUrl url = KUrl(xml.attribute("resource")); @@ -70,30 +87,13 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin if (!m_properties.contains("name")) m_properties.insert("name", url.fileName()); - //if (!url.isEmpty() && QFile::exists(url.path())) - { - m_thumbProd = new KThumb(clipManager, url, m_id, m_properties.value("file_hash")); - if (m_clipType == AV || m_clipType == AUDIO) slotCreateAudioTimer(); - } - //kDebug() << "type is video" << (m_clipType == AV) << " " << m_clipType; + m_thumbProd = new KThumb(clipManager, url, m_id, m_properties.value("file_hash")); + if (m_clipType == AV || m_clipType == AUDIO || m_clipType == PLAYLIST) slotCreateAudioTimer(); } -/*DocClipBase & DocClipBase::operator=(const DocClipBase & clip) { - DocClipBase::operator=(clip); - m_id = clip.getId(); - m_clipType = clip.clipType(); - m_name = clip.name(); - m_duration = clip.duration(); - m_audioThumbCreated = clip.audioThumbCreated(); - m_properties = clip.properties(); - return *this; -}*/ - DocClipBase::~DocClipBase() { - if (m_thumbProd) { - delete m_thumbProd; - } + delete m_thumbProd; if (m_audioTimer) { m_audioTimer->stop(); delete m_audioTimer; @@ -102,7 +102,7 @@ DocClipBase::~DocClipBase() m_baseTrackProducers.clear(); qDeleteAll(m_audioTrackProducers); m_audioTrackProducers.clear(); - if (m_videoOnlyProducer) delete m_videoOnlyProducer; + delete m_videoOnlyProducer; m_videoOnlyProducer = NULL; } @@ -114,30 +114,27 @@ void DocClipBase::setZone(QPoint zone) QPoint DocClipBase::zone() const { - QPoint zone; - zone.setX(m_properties.value("zone_in").toInt()); - zone.setY(m_properties.value("zone_out", "50").toInt()); + QPoint zone(m_properties.value("zone_in", "0").toInt(), m_properties.value("zone_out", "50").toInt()); return zone; } void DocClipBase::slotCreateAudioTimer() { connect(m_thumbProd, SIGNAL(audioThumbReady(QMap >)), this , SLOT(updateAudioThumbnail(QMap >))); - connect(this, SIGNAL(getAudioThumbs()), this , SLOT(slotGetAudioThumbs())); m_audioTimer = new QTimer(this); connect(m_audioTimer, SIGNAL(timeout()), this, SLOT(slotGetAudioThumbs())); } void DocClipBase::askForAudioThumbs() { - if (m_thumbProd) m_thumbProd->askForAudioThumbs(getId()); + if (m_thumbProd && m_audioTimer) m_thumbProd->askForAudioThumbs(getId()); } void DocClipBase::slotClearAudioCache() { if (m_thumbProd) m_thumbProd->stopAudioThumbs(); if (m_audioTimer != NULL) m_audioTimer->stop(); - audioFrameChache.clear(); + m_audioFrameCache.clear(); m_audioThumbCreated = false; } @@ -181,7 +178,7 @@ void DocClipBase::setClipType(CLIPTYPE type) m_clipType = type; m_properties.insert("type", QString::number((int) type)); - if (m_thumbProd && m_audioTimer == NULL && (m_clipType == AV || m_clipType == AUDIO)) + if (m_thumbProd && m_audioTimer == NULL && (m_clipType == AV || m_clipType == AUDIO || m_clipType == PLAYLIST)) slotCreateAudioTimer(); } @@ -231,8 +228,9 @@ const GenTime &DocClipBase::duration() const const GenTime DocClipBase::maxDuration() const { if (m_clipType == COLOR || m_clipType == IMAGE || m_clipType == TEXT || (m_clipType == SLIDESHOW && m_properties.value("loop") == "1")) { - const GenTime dur(15000, KdenliveSettings::project_fps()); - return dur; + /*const GenTime dur(15000, KdenliveSettings::project_fps()); + return dur;*/ + return GenTime(); } return m_duration; } @@ -242,6 +240,10 @@ bool DocClipBase::hasFileSize() const return true; } +qulonglong DocClipBase::fileSize() const +{ + return m_properties.value("file_size").toULongLong(); +} // virtual QDomElement DocClipBase::toXML() const @@ -255,7 +257,15 @@ QDomElement DocClipBase::toXML() const if (!i.value().isEmpty()) clip.setAttribute(i.key(), i.value()); } doc.appendChild(clip); - //kDebug()<<"/// CLIP XML: "< > data) { - //kDebug() << "CLIPBASE RECIEDVED AUDIO DATA*********************************************"; - audioFrameChache = data; + //kDebug() << "CLIPBASE RECIEDVED AUDIO DATA*********************************************"; + m_audioFrameCache = data; m_audioThumbCreated = true; emit gotAudioData(); } @@ -288,8 +298,8 @@ QList < GenTime > DocClipBase::snapMarkers() const { QList < GenTime > markers; - for (uint count = 0; count < m_snapMarkers.count(); ++count) { - markers.append(m_snapMarkers[count].time()); + for (int count = 0; count < m_snapMarkers.count(); ++count) { + markers.append(m_snapMarkers.at(count).time()); } return markers; @@ -300,10 +310,6 @@ QList < CommentedTime > DocClipBase::commentedSnapMarkers() const return m_snapMarkers; } -void DocClipBase::setSnapMarkers(QList < CommentedTime > markers) -{ - m_snapMarkers = markers; -} void DocClipBase::addSnapMarker(const GenTime & time, QString comment) { @@ -373,23 +379,23 @@ GenTime DocClipBase::findPreviousSnapMarker(const GenTime & currTime) { int it; for (it = 0; it < m_snapMarkers.count(); it++) { - if (m_snapMarkers[it].time() >= currTime) + if (m_snapMarkers.at(it).time() >= currTime) break; } if (it == 0) return GenTime(); - else if (it == m_snapMarkers.count() - 1 && m_snapMarkers[it].time() < currTime) - return m_snapMarkers[it].time(); - else return m_snapMarkers[it-1].time(); + else if (it == m_snapMarkers.count() - 1 && m_snapMarkers.at(it).time() < currTime) + return m_snapMarkers.at(it).time(); + else return m_snapMarkers.at(it - 1).time(); } GenTime DocClipBase::findNextSnapMarker(const GenTime & currTime) { int it; for (it = 0; it < m_snapMarkers.count(); it++) { - if (m_snapMarkers[it].time() > currTime) + if (m_snapMarkers.at(it).time() > currTime) break; } - if (it < m_snapMarkers.count() && m_snapMarkers[it].time() > currTime) return m_snapMarkers[it].time(); + if (it < m_snapMarkers.count() && m_snapMarkers.at(it).time() > currTime) return m_snapMarkers.at(it).time(); return duration(); } @@ -405,21 +411,52 @@ QString DocClipBase::markerComment(GenTime t) return QString(); } -void DocClipBase::deleteProducers() +void DocClipBase::deleteProducers(bool clearThumbCreator) { + if (clearThumbCreator && m_thumbProd) m_thumbProd->clearProducer(); + + delete m_videoOnlyProducer; + m_videoOnlyProducer = NULL; + qDeleteAll(m_baseTrackProducers); m_baseTrackProducers.clear(); - if (m_thumbProd) m_thumbProd->clearProducer(); qDeleteAll(m_audioTrackProducers); m_audioTrackProducers.clear(); - if (m_videoOnlyProducer) delete m_videoOnlyProducer; - m_videoOnlyProducer = NULL; } -void DocClipBase::setProducer(Mlt::Producer *producer) +void DocClipBase::setValid() +{ + m_placeHolder = false; +} + +void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readPropertiesFromProducer) { - if (producer == NULL) return; + if (producer == NULL || !producer->is_valid()) return; + if (reset) QMutexLocker locker(&m_producerMutex); + if (m_placeHolder) { + char *tmp = qstrdup(i18n("Missing clip").toUtf8().constData()); + producer->set("markup", tmp); + producer->set("bgcolour", "0xff0000ff"); + producer->set("pad", "10"); + delete[] tmp; + } QString id = producer->get("id"); + if (m_thumbProd) { + if (reset) m_thumbProd->setProducer(NULL); + if (!m_thumbProd->hasProducer()) { + if (m_clipType != AUDIO) { + if (!id.endsWith("_audio")) + m_thumbProd->setProducer(producer); + } + else m_thumbProd->setProducer(producer); + } + } + if (reset) { + // Clear all previous producers + kDebug() << "/+++++++++++++++ DELETE ALL PRODS " << producer->get("id"); + deleteProducers(false); + } + bool updated = false; if (id.contains('_')) { // this is a subtrack producer, insert it at correct place id = id.section('_', 1); @@ -430,11 +467,16 @@ void DocClipBase::setProducer(Mlt::Producer *producer) m_audioTrackProducers.append(NULL); } } - if (m_audioTrackProducers.at(pos) == NULL) m_audioTrackProducers[pos] = producer; + if (m_audioTrackProducers.at(pos) == NULL) { + m_audioTrackProducers[pos] = producer; + updated = true; + } return; - } - if (id.endsWith("video")) { - m_videoOnlyProducer = producer; + } else if (id.endsWith("video")) { + if (m_videoOnlyProducer == NULL) { + m_videoOnlyProducer = producer; + updated = true; + } return; } int pos = id.toInt(); @@ -443,66 +485,113 @@ void DocClipBase::setProducer(Mlt::Producer *producer) m_baseTrackProducers.append(NULL); } } - if (m_baseTrackProducers.at(pos) == NULL) m_baseTrackProducers[pos] = producer; + if (m_baseTrackProducers.at(pos) == NULL) { + m_baseTrackProducers[pos] = producer; + updated = true; + } } else { - if (m_baseTrackProducers.isEmpty()) m_baseTrackProducers.append(producer); - else if (m_baseTrackProducers.at(0) == NULL) m_baseTrackProducers[0] = producer; + if (m_baseTrackProducers.isEmpty()) { + m_baseTrackProducers.append(producer); + updated = true; + } + else if (m_baseTrackProducers.at(0) == NULL) { + m_baseTrackProducers[0] = producer; + updated = true; + } } - //m_clipProducer = producer; - //m_clipProducer->set("transparency", m_properties.value("transparency").toInt()); - if (m_thumbProd && !m_thumbProd->hasProducer()) m_thumbProd->setProducer(producer); + if (updated && readPropertiesFromProducer && (m_clipType != COLOR && m_clipType != IMAGE && m_clipType != TEXT)) + setDuration(GenTime(producer->get_length(), KdenliveSettings::project_fps())); +} + +static double getPixelAspect(QMap& props) { + int width = props.value("frame_size").section('x', 0, 0).toInt(); + int height = props.value("frame_size").section('x', 1, 1).toInt(); + int aspectNumerator = props.value("force_aspect_num").toInt(); + int aspectDenominator = props.value("force_aspect_den").toInt(); + if (aspectDenominator != 0 && width != 0) + return double(height) * aspectNumerator / aspectDenominator / width; + else + return 1.0; } Mlt::Producer *DocClipBase::audioProducer(int track) { + QMutexLocker locker(&m_producerMutex); if (m_audioTrackProducers.count() <= track) { while (m_audioTrackProducers.count() - 1 < track) { m_audioTrackProducers.append(NULL); } } if (m_audioTrackProducers.at(track) == NULL) { - Mlt::Producer *base = producer(); - m_audioTrackProducers[track] = new Mlt::Producer(*(base->profile()), base->get("resource")); - if (m_properties.contains("force_aspect_ratio")) m_audioTrackProducers.at(track)->set("force_aspect_ratio", m_properties.value("force_aspect_ratio").toDouble()); - if (m_properties.contains("threads")) m_audioTrackProducers.at(track)->set("threads", m_properties.value("threads").toInt()); - m_audioTrackProducers.at(track)->set("video_index", -1); - if (m_properties.contains("audio_index")) m_audioTrackProducers.at(track)->set("audio_index", m_properties.value("audio_index").toInt()); - char *tmp = (char *) qstrdup(QString(getId() + '_' + QString::number(track) + "_audio").toUtf8().data()); - m_audioTrackProducers.at(track)->set("id", tmp); - delete[] tmp; + int i; + for (i = 0; i < m_audioTrackProducers.count(); i++) + if (m_audioTrackProducers.at(i) != NULL) break; + Mlt::Producer *base; + if (i >= m_audioTrackProducers.count()) { + // Could not find a valid producer for that clip + locker.unlock(); + base = producer(); + if (base == NULL) { + return NULL; + } + locker.relock(); + } + else base = m_audioTrackProducers.at(i); + m_audioTrackProducers[track] = cloneProducer(base); + adjustProducerProperties(m_audioTrackProducers.at(track), QString(getId() + '_' + QString::number(track) + "_audio"), false, true); } return m_audioTrackProducers.at(track); } + +void DocClipBase::adjustProducerProperties(Mlt::Producer *prod, const QString &id, bool mute, bool blind) +{ + if (m_properties.contains("force_aspect_num") && m_properties.contains("force_aspect_den") && m_properties.contains("frame_size")) + prod->set("force_aspect_ratio", getPixelAspect(m_properties)); + if (m_properties.contains("force_fps")) prod->set("force_fps", m_properties.value("force_fps").toDouble()); + if (m_properties.contains("force_progressive")) prod->set("force_progressive", m_properties.value("force_progressive").toInt()); + if (m_properties.contains("force_tff")) prod->set("force_tff", m_properties.value("force_tff").toInt()); + if (m_properties.contains("threads")) prod->set("threads", m_properties.value("threads").toInt()); + if (mute) prod->set("audio_index", -1); + else if (m_properties.contains("audio_index")) prod->set("audio_index", m_properties.value("audio_index").toInt()); + if (blind) prod->set("video_index", -1); + else if (m_properties.contains("video_index")) prod->set("video_index", m_properties.value("video_index").toInt()); + prod->set("id", id.toUtf8().data()); + if (m_properties.contains("force_colorspace")) prod->set("force_colorspace", m_properties.value("force_colorspace").toInt()); + if (m_properties.contains("full_luma")) prod->set("set.force_full_luma", m_properties.value("full_luma").toInt()); + if (m_properties.contains("proxy_out")) { + // We have a proxy clip, make sure the proxy has same duration as original + prod->set("length", m_properties.value("duration").toInt()); + prod->set("out", m_properties.value("proxy_out").toInt()); + } + +} + Mlt::Producer *DocClipBase::videoProducer() { + QMutexLocker locker(&m_producerMutex); if (m_videoOnlyProducer == NULL) { int i; for (i = 0; i < m_baseTrackProducers.count(); i++) if (m_baseTrackProducers.at(i) != NULL) break; if (i >= m_baseTrackProducers.count()) return NULL; - m_videoOnlyProducer = new Mlt::Producer(*m_baseTrackProducers.at(i)->profile(), m_baseTrackProducers.at(i)->get("resource")); - if (m_properties.contains("force_aspect_ratio")) m_videoOnlyProducer->set("force_aspect_ratio", m_properties.value("force_aspect_ratio").toDouble()); - if (m_properties.contains("threads")) m_videoOnlyProducer->set("threads", m_properties.value("threads").toInt()); - m_videoOnlyProducer->set("audio_index", -1); - if (m_properties.contains("video_index")) m_videoOnlyProducer->set("video_index", m_properties.value("video_index").toInt()); - char *tmp = (char *) qstrdup(QString(getId() + "_video").toUtf8().data()); - m_videoOnlyProducer->set("id", tmp); - delete[] tmp; + m_videoOnlyProducer = cloneProducer(m_baseTrackProducers.at(i)); + adjustProducerProperties(m_videoOnlyProducer, QString(getId() + "_video"), true, false); } return m_videoOnlyProducer; } Mlt::Producer *DocClipBase::producer(int track) { - /*for (int i = 0; i < m_baseTrackProducers.count(); i++) { - if (m_baseTrackProducers.at(i)) kDebug() << "// PROD: " << i << ", ID: " << m_baseTrackProducers.at(i)->get("id"); - }*/ - if (track == -1 || (m_clipType != AUDIO && m_clipType != AV)) { - if (m_baseTrackProducers.count() == 0) return NULL; + QMutexLocker locker(&m_producerMutex); + if (track == -1 || (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST)) { + if (m_baseTrackProducers.count() == 0) { + return NULL; + } for (int i = 0; i < m_baseTrackProducers.count(); i++) { - if (m_baseTrackProducers.at(i) != NULL) + if (m_baseTrackProducers.at(i) != NULL) { return m_baseTrackProducers.at(i); + } } return NULL; } @@ -515,23 +604,46 @@ Mlt::Producer *DocClipBase::producer(int track) int i; for (i = 0; i < m_baseTrackProducers.count(); i++) if (m_baseTrackProducers.at(i) != NULL) break; - if (i >= m_baseTrackProducers.count()) return NULL; - m_baseTrackProducers[track] = new Mlt::Producer(*m_baseTrackProducers.at(i)->profile(), m_baseTrackProducers.at(i)->get("resource")); - if (m_properties.contains("force_aspect_ratio")) m_baseTrackProducers[track]->set("force_aspect_ratio", m_properties.value("force_aspect_ratio").toDouble()); - if (m_properties.contains("threads")) m_baseTrackProducers[track]->set("threads", m_properties.value("threads").toInt()); - if (m_properties.contains("video_index")) m_baseTrackProducers[track]->set("video_index", m_properties.value("video_index").toInt()); - if (m_properties.contains("audio_index")) m_baseTrackProducers[track]->set("audio_index", m_properties.value("audio_index").toInt()); - char *tmp = (char *) qstrdup(QString(getId() + '_' + QString::number(track)).toUtf8().data()); - m_baseTrackProducers[track]->set("id", tmp); - delete[] tmp; - if (KdenliveSettings::dropbframes() && m_baseTrackProducers.at(i)->get("skip_loop_filter") && strcmp(m_baseTrackProducers.at(i)->get("skip_loop_filter"), "all") == 0) { - m_baseTrackProducers[track]->set("skip_loop_filter", "all"); - m_baseTrackProducers[track]->set("skip_frame", "bidir"); + + if (i >= m_baseTrackProducers.count()) { + // Could not find a valid producer for that clip, check in + return NULL; } + m_baseTrackProducers[track] = cloneProducer(m_baseTrackProducers.at(i)); + adjustProducerProperties(m_baseTrackProducers.at(track), QString(getId() + '_' + QString::number(track)), false, false); } return m_baseTrackProducers.at(track); } + +Mlt::Producer *DocClipBase::cloneProducer(Mlt::Producer *source) +{ + Mlt::Producer *result = NULL; + QString url = source->get("resource"); + if (KIO::NetAccess::exists(KUrl(url), KIO::NetAccess::SourceSide, 0)) { + char *tmp = qstrdup(url.toUtf8().constData()); + result = new Mlt::Producer(*source->profile(), tmp); + delete[] tmp; + } + if (result == NULL || !result->is_valid()) { + // placeholder clip + QString txt = "+" + i18n("Missing clip") + ".txt"; + char *tmp = qstrdup(txt.toUtf8().constData()); + result = new Mlt::Producer(*source->profile(), tmp); + delete[] tmp; + if (result == NULL || !result->is_valid()) + result = new Mlt::Producer(*source->profile(), "colour:red"); + else { + result->set("bgcolour", "0xff0000ff"); + result->set("pad", "10"); + } + } + Mlt::Properties props(result->get_properties()); + Mlt::Properties src_props(source->get_properties()); + props.inherit(src_props); + return result; +} + void DocClipBase::setProducerProperty(const char *name, int data) { for (int i = 0; i < m_baseTrackProducers.count(); i++) { @@ -540,6 +652,14 @@ void DocClipBase::setProducerProperty(const char *name, int data) } } +void DocClipBase::setProducerProperty(const char *name, double data) +{ + for (int i = 0; i < m_baseTrackProducers.count(); i++) { + if (m_baseTrackProducers.at(i) != NULL) + m_baseTrackProducers[i]->set(name, data); + } +} + void DocClipBase::setProducerProperty(const char *name, const char *data) { for (int i = 0; i < m_baseTrackProducers.count(); i++) { @@ -548,6 +668,14 @@ void DocClipBase::setProducerProperty(const char *name, const char *data) } } +void DocClipBase::resetProducerProperty(const char *name) +{ + for (int i = 0; i < m_baseTrackProducers.count(); i++) { + if (m_baseTrackProducers.at(i) != NULL) + m_baseTrackProducers[i]->set(name, (const char*) NULL); + } +} + const char *DocClipBase::producerProperty(const char *name) const { for (int i = 0; i < m_baseTrackProducers.count(); i++) { @@ -562,16 +690,55 @@ const char *DocClipBase::producerProperty(const char *name) const void DocClipBase::slotRefreshProducer() { if (m_baseTrackProducers.count() == 0) return; - kDebug() << "//////////// REFRESH CLIP !!!!!!!!!!!!!!!!"; if (m_clipType == SLIDESHOW) { - /*char *tmp = (char *) qstrdup(getProperty("resource").toUtf8().data()); - Mlt::Producer producer(*(m_clipProducer->profile()), tmp); - delete[] tmp; + /*Mlt::Producer producer(*(m_clipProducer->profile()), getProperty("resource").toUtf8().data()); delete m_clipProducer; m_clipProducer = new Mlt::Producer(producer.get_producer()); if (!getProperty("out").isEmpty()) m_clipProducer->set_in_and_out(getProperty("in").toInt(), getProperty("out").toInt());*/ setProducerProperty("ttl", getProperty("ttl").toInt()); //m_clipProducer->set("id", getProperty("id")); + if (!getProperty("animation").isEmpty()) { + Mlt::Service clipService(m_baseTrackProducers.at(0)->get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (strcmp(filter->get("mlt_service"), "affine") == 0) { + break; + } else if (strcmp(filter->get("mlt_service"), "boxblur") == 0) { + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + + if (!filter || strcmp(filter->get("mlt_service"), "affine")) { + // filter does not exist, create it. + Mlt::Filter *filter = new Mlt::Filter(*(m_baseTrackProducers.at(0)->profile()), "affine"); + if (filter && filter->is_valid()) { + int cycle = getProperty("ttl").toInt(); + QString geometry = SlideshowClip::animationToGeometry(getProperty("animation"), cycle); + if (!geometry.isEmpty()) { + if (getProperty("animation").contains("low-pass")) { + Mlt::Filter *blur = new Mlt::Filter(*(m_baseTrackProducers.at(0)->profile()), "boxblur"); + if (blur && blur->is_valid()) + clipService.attach(*blur); + } + filter->set("transition.geometry", geometry.toUtf8().data()); + filter->set("transition.cycle", cycle); + clipService.attach(*filter); + } + } + } + } else { + Mlt::Service clipService(m_baseTrackProducers.at(0)->get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(0); + while (filter) { + if (strcmp(filter->get("mlt_service"), "affine") == 0 || strcmp(filter->get("mlt_service"), "boxblur") == 0) { + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } if (getProperty("fade") == "1") { // we want a fade filter effect kDebug() << "//////////// FADE WANTED"; @@ -579,20 +746,17 @@ void DocClipBase::slotRefreshProducer() int ct = 0; Mlt::Filter *filter = clipService.filter(ct); while (filter) { - if (filter->get("mlt_service") == "luma") { + if (strcmp(filter->get("mlt_service"), "luma") == 0) { break; } ct++; filter = clipService.filter(ct); } - if (filter && filter->get("mlt_service") == "luma") { - filter->set("period", getProperty("ttl").toInt() - 1); - filter->set("luma.out", getProperty("luma_duration").toInt()); - QString resource = getProperty("luma_file"); - char *tmp = (char *) qstrdup(resource.toUtf8().data()); - filter->set("luma.resource", tmp); - delete[] tmp; + if (filter && strcmp(filter->get("mlt_service"), "luma") == 0) { + filter->set("cycle", getProperty("ttl").toInt()); + filter->set("duration", getProperty("luma_duration").toInt()); + filter->set("luma.resource", getProperty("luma_file").toUtf8().data()); if (!getProperty("softness").isEmpty()) { int soft = getProperty("softness").toInt(); filter->set("luma.softness", (double) soft / 100.0); @@ -600,12 +764,9 @@ void DocClipBase::slotRefreshProducer() } else { // filter does not exist, create it... Mlt::Filter *filter = new Mlt::Filter(*(m_baseTrackProducers.at(0)->profile()), "luma"); - filter->set("period", getProperty("ttl").toInt() - 1); - filter->set("luma.out", getProperty("luma_duration").toInt()); - QString resource = getProperty("luma_file"); - char *tmp = (char *) qstrdup(resource.toUtf8().data()); - filter->set("luma.resource", tmp); - delete[] tmp; + filter->set("cycle", getProperty("ttl").toInt()); + filter->set("duration", getProperty("luma_duration").toInt()); + filter->set("luma.resource", getProperty("luma_file").toUtf8().data()); if (!getProperty("softness").isEmpty()) { int soft = getProperty("softness").toInt(); filter->set("luma.softness", (double) soft / 100.0); @@ -618,7 +779,37 @@ void DocClipBase::slotRefreshProducer() int ct = 0; Mlt::Filter *filter = clipService.filter(0); while (filter) { - if (filter->get("mlt_service") == "luma") { + if (strcmp(filter->get("mlt_service"), "luma") == 0) { + clipService.detach(*filter); + } else ct++; + filter = clipService.filter(ct); + } + } + if (getProperty("crop") == "1") { + // we want a center crop filter effect + Mlt::Service clipService(m_baseTrackProducers.at(0)->get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(ct); + while (filter) { + if (strcmp(filter->get("mlt_service"), "crop") == 0) { + break; + } + ct++; + filter = clipService.filter(ct); + } + + if (!filter || strcmp(filter->get("mlt_service"), "crop")) { + // filter does not exist, create it... + Mlt::Filter *filter = new Mlt::Filter(*(m_baseTrackProducers.at(0)->profile()), "crop"); + filter->set("center", 1); + clipService.attach(*filter); + } + } else { + Mlt::Service clipService(m_baseTrackProducers.at(0)->get_service()); + int ct = 0; + Mlt::Filter *filter = clipService.filter(0); + while (filter) { + if (strcmp(filter->get("mlt_service"), "crop") == 0) { clipService.detach(*filter); } else ct++; filter = clipService.filter(ct); @@ -634,18 +825,38 @@ void DocClipBase::setProperties(QMap properties) QMapIterator i(properties); bool refreshProducer = false; QStringList keys; - keys << "luma_duration" << "luma_file" << "fade" << "ttl" << "softness"; + keys << "luma_duration" << "luma_file" << "fade" << "ttl" << "softness" << "crop" << "animation"; + QString oldProxy = m_properties.value("proxy"); while (i.hasNext()) { i.next(); setProperty(i.key(), i.value()); if (m_clipType == SLIDESHOW && keys.contains(i.key())) refreshProducer = true; } + if (properties.contains("proxy")) { + QString value = properties.value("proxy"); + // If value is "-", that means user manually disabled proxy on this clip + if (value.isEmpty() || value == "-") { + // reset proxy + emit abortProxy(m_id, oldProxy); + } + else { + emit createProxy(m_id); + } + } if (refreshProducer) slotRefreshProducer(); } void DocClipBase::setMetadata(QMap properties) { - m_metadata = properties; + QMapIterator i(properties); + while (i.hasNext()) { + i.next(); + if (i.value().isEmpty() && m_metadata.contains(i.key())) { + m_metadata.remove(i.key()); + } else { + m_metadata.insert(i.key(), i.value()); + } + } } QMap DocClipBase::metadata() const @@ -680,19 +891,58 @@ void DocClipBase::getFileHash(const QString url) file.close(); fileHash = QCryptographicHash::hash(fileData, QCryptographicHash::Md5); m_properties.insert("file_hash", QString(fileHash.toHex())); - //kDebug() << file.fileName() << file.size() << fileHash.toHex(); } } +bool DocClipBase::checkHash() const +{ + KUrl url = fileURL(); + if (!url.isEmpty() && getClipHash() != getHash(url.path())) return false; + return true; +} + QString DocClipBase::getClipHash() const { QString hash; if (m_clipType == SLIDESHOW) hash = QCryptographicHash::hash(m_properties.value("resource").toAscii().data(), QCryptographicHash::Md5).toHex(); else if (m_clipType == COLOR) hash = QCryptographicHash::hash(m_properties.value("colour").toAscii().data(), QCryptographicHash::Md5).toHex(); - else hash = m_properties.value("file_hash"); + else if (m_clipType == TEXT) hash = QCryptographicHash::hash(QString("title" + getId() + m_properties.value("xmldata")).toUtf8().data(), QCryptographicHash::Md5).toHex(); + else { + if (m_properties.contains("file_hash")) hash = m_properties.value("file_hash"); + if (hash.isEmpty()) hash = getHash(fileURL().path()); + + } return hash; } +void DocClipBase::setPlaceHolder(bool place) +{ + m_placeHolder = place; +} + +// static +QString DocClipBase::getHash(const QString &path) +{ + QFile file(path); + if (file.open(QIODevice::ReadOnly)) { // write size and hash only if resource points to a file + QByteArray fileData; + QByteArray fileHash; + /* + * 1 MB = 1 second per 450 files (or faster) + * 10 MB = 9 seconds per 450 files (or faster) + */ + if (file.size() > 1000000*2) { + fileData = file.read(1000000); + if (file.seek(file.size() - 1000000)) + fileData.append(file.readAll()); + } else + fileData = file.readAll(); + file.close(); + return QCryptographicHash::hash(fileData, QCryptographicHash::Md5).toHex(); + } + return QString(); +} + void DocClipBase::refreshThumbUrl() { if (m_thumbProd) m_thumbProd->updateThumbUrl(m_properties.value("file_hash")); @@ -707,16 +957,38 @@ void DocClipBase::setProperty(const QString &key, const QString &value) } else if (key == "out") setDuration(GenTime(value.toInt(), KdenliveSettings::project_fps())); //else if (key == "transparency") m_clipProducer->set("transparency", value.toInt()); else if (key == "colour") { - char *tmp = (char *) qstrdup(value.toUtf8().data()); - setProducerProperty("colour", tmp); - delete[] tmp; + setProducerProperty("colour", value.toUtf8().data()); + } else if (key == "templatetext") { + setProducerProperty("templatetext", value.toUtf8().data()); + setProducerProperty("force_reload", 1); } else if (key == "xmldata") { + setProducerProperty("xmldata", value.toUtf8().data()); setProducerProperty("force_reload", 1); - } else if (key == "force_aspect_ratio") { + } else if (key == "force_aspect_num") { + if (value.isEmpty()) { + m_properties.remove("force_aspect_num"); + resetProducerProperty("force_aspect_ratio"); + } else setProducerProperty("force_aspect_ratio", getPixelAspect(m_properties)); + } else if (key == "force_aspect_den") { + if (value.isEmpty()) { + m_properties.remove("force_aspect_den"); + resetProducerProperty("force_aspect_ratio"); + } else setProducerProperty("force_aspect_ratio", getPixelAspect(m_properties)); + } else if (key == "force_fps") { + if (value.isEmpty()) { + m_properties.remove("force_fps"); + resetProducerProperty("force_fps"); + } else setProducerProperty("force_fps", value.toDouble()); + } else if (key == "force_progressive") { if (value.isEmpty()) { - m_properties.remove("force_aspect_ratio"); - setProducerProperty("force_aspect_ratio", 0); - } else setProducerProperty("force_aspect_ratio", value.toDouble()); + m_properties.remove("force_progressive"); + resetProducerProperty("force_progressive"); + } else setProducerProperty("force_progressive", value.toInt()); + } else if (key == "force_tff") { + if (value.isEmpty()) { + m_properties.remove("force_tff"); + resetProducerProperty("force_tff"); + } else setProducerProperty("force_tff", value.toInt()); } else if (key == "threads") { if (value.isEmpty()) { m_properties.remove("threads"); @@ -732,6 +1004,16 @@ void DocClipBase::setProperty(const QString &key, const QString &value) m_properties.remove("audio_index"); setProducerProperty("audio_index", m_properties.value("default_audio").toInt()); } else setProducerProperty("audio_index", value.toInt()); + } else if (key == "force_colorspace") { + if (value.isEmpty()) { + m_properties.remove("force_colorspace"); + resetProducerProperty("force_colorspace"); + } else setProducerProperty("force_colorspace", value.toInt()); + } else if (key == "full_luma") { + if (value.isEmpty()) { + m_properties.remove("full_luma"); + resetProducerProperty("set.force_full_luma"); + } else setProducerProperty("set.force_full_luma", value.toInt()); } } @@ -742,21 +1024,124 @@ QMap DocClipBase::properties() const bool DocClipBase::slotGetAudioThumbs() { - if (m_thumbProd == NULL) return false; - if (!KdenliveSettings::audiothumbnails()) { + if (m_thumbProd == NULL || isPlaceHolder()) return false; + if (!KdenliveSettings::audiothumbnails() || m_audioTimer == NULL) { if (m_audioTimer != NULL) m_audioTimer->stop(); return false; } if (m_audioThumbCreated) { - if (m_audioTimer != NULL) m_audioTimer->stop(); + m_audioTimer->stop(); return false; } - if (m_audioTimer != NULL) - m_audioTimer->start(1500); + m_audioTimer->start(1500); double lengthInFrames = duration().frames(KdenliveSettings::project_fps()); m_thumbProd->getAudioThumbs(2, 0, lengthInFrames /*must be number of frames*/, 20); return true; } +bool DocClipBase::isPlaceHolder() const +{ + return m_placeHolder; +} + +void DocClipBase::addCutZone(int in, int out, QString desc) +{ + CutZoneInfo info; + info.zone = QPoint(in, out); + info.description = desc; + for (int i = 0; i < m_cutZones.count(); i++) + if (m_cutZones.at(i).zone == info.zone) { + return; + } + m_cutZones.append(info); +} + +bool DocClipBase::hasCutZone(QPoint p) const +{ + for (int i = 0; i < m_cutZones.count(); i++) + if (m_cutZones.at(i).zone == p) return true; + return false; +} + + +void DocClipBase::removeCutZone(int in, int out) +{ + QPoint p(in, out); + for (int i = 0; i < m_cutZones.count(); i++) { + if (m_cutZones.at(i).zone == p) { + m_cutZones.removeAt(i); + i--; + } + } +} + +void DocClipBase::updateCutZone(int oldin, int oldout, int in, int out, QString desc) +{ + QPoint old(oldin, oldout); + for (int i = 0; i < m_cutZones.size(); ++i) { + if (m_cutZones.at(i).zone == old) { + CutZoneInfo info; + info.zone = QPoint(in, out); + info.description = desc; + m_cutZones.replace(i, info); + break; + } + } +} + +QList DocClipBase::cutZones() const +{ + return m_cutZones; +} + +bool DocClipBase::hasVideoCodec(const QString &codec) const +{ + Mlt::Producer *prod = NULL; + if (m_baseTrackProducers.count() == 0) return false; + for (int i = 0; i < m_baseTrackProducers.count(); i++) { + if (m_baseTrackProducers.at(i) != NULL) { + prod = m_baseTrackProducers.at(i); + break; + } + } + + if (!prod) return false; + int default_video = prod->get_int("video_index"); + char property[200]; + snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video); + return prod->get(property) == codec; +} + +bool DocClipBase::hasAudioCodec(const QString &codec) const +{ + Mlt::Producer *prod = NULL; + if (m_baseTrackProducers.count() == 0) return false; + for (int i = 0; i < m_baseTrackProducers.count(); i++) { + if (m_baseTrackProducers.at(i) != NULL) { + prod = m_baseTrackProducers.at(i); + break; + } + } + if (!prod) return false; + int default_video = prod->get_int("audio_index"); + char property[200]; + snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video); + return prod->get(property) == codec; +} + + +void DocClipBase::slotExtractImage(int frame, int frame2) +{ + if (m_thumbProd == NULL) return; + m_thumbProd->extractImage(frame, frame2); +} + +QPixmap DocClipBase::extractImage(int frame, int width, int height) +{ + if (m_thumbProd == NULL) return QPixmap(width, height); + QMutexLocker locker(&m_producerMutex); + QPixmap p = m_thumbProd->extractImage(frame, width, height); + return p; +}