X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.cpp;h=fc45161ae6ab79b8f804c23846154644532c920b;hb=49c3f9376d4b9f7d185c4d6b22e662b127debdcb;hp=38cb277c399dea60f481017ba547ec78eab2946f;hpb=8f43422a260869d33fefa2f32bfb38f4f5bb5765;p=kdenlive diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 38cb277c..fc45161a 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -87,35 +87,17 @@ 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 || m_clipType == PLAYLIST) slotCreateAudioTimer(); - } - //kDebug() << "type is video" << (m_clipType == AV) << " " << m_clipType; -} - -/*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; -}*/ + 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() { - kDebug() << "CLIP " << m_id << " DELETED******************************"; delete m_thumbProd; if (m_audioTimer) { m_audioTimer->stop(); delete m_audioTimer; } - /*kDebug() <<" * * *CNT "< 0) kDebug()<<"YOYO: "<get_out()<<", CUT: "<is_cut();*/ qDeleteAll(m_baseTrackProducers); m_baseTrackProducers.clear(); qDeleteAll(m_audioTrackProducers); @@ -227,7 +209,7 @@ bool DocClipBase::isTransparent() const return (m_properties.value("transparency") == "1"); } -const QString DocClipBase::getProperty(const QString prop) const +const QString DocClipBase::getProperty(const QString &prop) const { return m_properties.value(prop); } @@ -432,17 +414,6 @@ QString DocClipBase::markerComment(GenTime t) void DocClipBase::deleteProducers(bool clearThumbCreator) { if (clearThumbCreator && m_thumbProd) m_thumbProd->clearProducer(); - /*kDebug()<<"// CLIP KILL PRODS ct: "<hasProducer())) m_thumbProd->setProducer(producer); + if (producer == NULL) return; + if (reset) QMutexLocker locker(&m_producerMutex); + if (m_placeHolder || !producer->is_valid()) { + 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); } - QString id = producer->get("id"); bool updated = false; if (id.contains('_')) { // this is a subtrack producer, insert it at correct place @@ -513,8 +501,6 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readProp } if (updated && readPropertiesFromProducer && (m_clipType != COLOR && m_clipType != IMAGE && m_clipType != TEXT)) setDuration(GenTime(producer->get_length(), KdenliveSettings::project_fps())); - //m_clipProducer = producer; - //m_clipProducer->set("transparency", m_properties.value("transparency").toInt()); } static double getPixelAspect(QMap& props) { @@ -530,6 +516,7 @@ static double getPixelAspect(QMap& props) { 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); @@ -539,13 +526,18 @@ Mlt::Producer *DocClipBase::audioProducer(int track) int i; for (i = 0; i < m_audioTrackProducers.count(); i++) if (m_audioTrackProducers.at(i) != NULL) break; - if (i < m_audioTrackProducers.count()) { - // Could not find a valid producer for that clip, check in - return m_audioTrackProducers.at(i); + 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(); } - - Mlt::Producer *base = producer(); - m_audioTrackProducers[track] = new Mlt::Producer(*(base->profile()), base->get("resource")); + 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); @@ -577,12 +569,13 @@ void DocClipBase::adjustProducerProperties(Mlt::Producer *prod, const QString &i 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")); + m_videoOnlyProducer = cloneProducer(m_baseTrackProducers.at(i)); adjustProducerProperties(m_videoOnlyProducer, QString(getId() + "_video"), true, false); } return m_videoOnlyProducer; @@ -590,14 +583,15 @@ Mlt::Producer *DocClipBase::videoProducer() 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"); - }*/ + QMutexLocker locker(&m_producerMutex); if (track == -1 || (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST)) { - if (m_baseTrackProducers.count() == 0) return NULL; + 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; } @@ -615,18 +609,42 @@ Mlt::Producer *DocClipBase::producer(int track) // Could not find a valid producer for that clip, check in return NULL; } - - if (KIO::NetAccess::exists(KUrl(m_baseTrackProducers.at(i)->get("resource")), KIO::NetAccess::SourceSide, 0)) - m_baseTrackProducers[track] = new Mlt::Producer(*m_baseTrackProducers.at(i)->profile(), m_baseTrackProducers.at(i)->get("resource")); - else { // special case for placeholder clips - m_baseTrackProducers[track] = NULL; - 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 = QString::fromUtf8(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"); + } + return result; + } + 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++) { @@ -809,11 +827,23 @@ void DocClipBase::setProperties(QMap properties) bool refreshProducer = false; QStringList keys; 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(); } @@ -840,7 +870,7 @@ void DocClipBase::clearProperty(const QString &key) m_properties.remove(key); } -void DocClipBase::getFileHash(const QString url) +void DocClipBase::getFileHash(const QString &url) { if (m_clipType == SLIDESHOW) return; QFile file(url); @@ -880,7 +910,7 @@ QString DocClipBase::getClipHash() const 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"); - else hash = getHash(fileURL().path()); + if (hash.isEmpty()) hash = getHash(fileURL().path()); } return hash; @@ -986,16 +1016,6 @@ void DocClipBase::setProperty(const QString &key, const QString &value) resetProducerProperty("set.force_full_luma"); } else setProducerProperty("set.force_full_luma", value.toInt()); } - else if (key == "proxy") { - // If value is "-", that means user manually disabled proxy on this clip - if (value.isEmpty() || value == "-") { - // reset proxy - emit abortProxy(m_id); - } - else { - emit createProxy(m_id); - } - } } QMap DocClipBase::properties() const @@ -1111,4 +1131,18 @@ bool DocClipBase::hasAudioCodec(const QString &codec) const } +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; +} +