X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.cpp;h=fc45161ae6ab79b8f804c23846154644532c920b;hb=734a2ab657a472fba50202160d47261e97155078;hp=06342e6c9dbcbbd6f83d2cfa4c6a85b501e5b3e6;hpb=92aa0ab52311111e893535c7762fc7a58bd490fb;p=kdenlive diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 06342e6c..fc45161a 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -53,8 +53,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin m_audioThumbCreated(false), m_id(id), m_placeHolder(xml.hasAttribute("placeholder")), - m_properties(), - m_abortProxy(false) + m_properties() { int type = xml.attribute("type").toInt(); m_clipType = (CLIPTYPE) type; @@ -88,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); @@ -228,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); } @@ -430,26 +411,9 @@ QString DocClipBase::markerComment(GenTime t) return QString(); } -void DocClipBase::clearProducers() -{ - m_baseTrackProducers.clear(); -} - void DocClipBase::deleteProducers(bool clearThumbCreator) { - kDebug() << "// CLIP KILL PRODS ct: " << m_baseTrackProducers.count(); 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 id = id.section('_', 1); @@ -485,10 +467,16 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset) 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; } else if (id.endsWith("video")) { - m_videoOnlyProducer = producer; + if (m_videoOnlyProducer == NULL) { + m_videoOnlyProducer = producer; + updated = true; + } return; } int pos = id.toInt(); @@ -497,13 +485,22 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset) 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 (updated && readPropertiesFromProducer && (m_clipType != COLOR && m_clipType != IMAGE && m_clipType != TEXT)) + setDuration(GenTime(producer->get_length(), KdenliveSettings::project_fps())); } static double getPixelAspect(QMap& props) { @@ -519,62 +516,82 @@ 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); } } 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_num") && m_properties.contains("force_aspect_den") && m_properties.contains("frame_size")) - m_audioTrackProducers.at(track)->set("force_aspect_ratio", getPixelAspect(m_properties)); - if (m_properties.contains("force_fps")) m_audioTrackProducers.at(track)->set("force_fps", m_properties.value("force_fps").toDouble()); - if (m_properties.contains("force_progressive")) m_audioTrackProducers.at(track)->set("force_progressive", m_properties.value("force_progressive").toInt()); - if (m_properties.contains("force_tff")) m_audioTrackProducers.at(track)->set("force_tff", m_properties.value("force_tff").toInt()); - 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()); - m_audioTrackProducers.at(track)->set("id", QString(getId() + '_' + QString::number(track) + "_audio").toUtf8().data()); - if (m_properties.contains("force_colorspace")) m_audioTrackProducers.at(track)->set("force_colorspace", m_properties.value("force_colorspace").toInt()); - if (m_properties.contains("full_luma")) m_audioTrackProducers.at(track)->set("set.force_full_luma", m_properties.value("full_luma").toInt()); + 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_num") && m_properties.contains("force_aspect_den") && m_properties.contains("frame_size")) - m_videoOnlyProducer->set("force_aspect_ratio", getPixelAspect(m_properties)); - if (m_properties.contains("force_fps")) m_videoOnlyProducer->set("force_fps", m_properties.value("force_fps").toDouble()); - if (m_properties.contains("force_progressive")) m_videoOnlyProducer->set("force_progressive", m_properties.value("force_progressive").toInt()); - if (m_properties.contains("force_tff")) m_videoOnlyProducer->set("force_tff", m_properties.value("force_tff").toInt()); - 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()); - m_videoOnlyProducer->set("id", QString(getId() + "_video").toUtf8().data()); - if (m_properties.contains("force_colorspace")) m_videoOnlyProducer->set("force_colorspace", m_properties.value("force_colorspace").toInt()); - if (m_properties.contains("full_luma")) m_videoOnlyProducer->set("set.force_full_luma", m_properties.value("full_luma").toInt()); + 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; } @@ -588,30 +605,46 @@ Mlt::Producer *DocClipBase::producer(int track) for (i = 0; i < m_baseTrackProducers.count(); i++) if (m_baseTrackProducers.at(i) != NULL) break; - if (i >= m_baseTrackProducers.count()) 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; + if (i >= m_baseTrackProducers.count()) { + // Could not find a valid producer for that clip, check in return NULL; } - if (m_properties.contains("force_aspect_num") && m_properties.contains("force_aspect_den") && m_properties.contains("frame_size")) - m_baseTrackProducers[track]->set("force_aspect_ratio", getPixelAspect(m_properties)); - if (m_properties.contains("force_fps")) m_baseTrackProducers[track]->set("force_fps", m_properties.value("force_fps").toDouble()); - if (m_properties.contains("force_progressive")) m_baseTrackProducers[track]->set("force_progressive", m_properties.value("force_progressive").toInt()); - if (m_properties.contains("force_tff")) m_baseTrackProducers[track]->set("force_tff", m_properties.value("force_tff").toInt()); - 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()); - m_baseTrackProducers[track]->set("id", QString(getId() + '_' + QString::number(track)).toUtf8().data()); - - if (m_properties.contains("force_colorspace")) m_baseTrackProducers[track]->set("force_colorspace", m_properties.value("force_colorspace").toInt()); - if (m_properties.contains("full_luma")) m_baseTrackProducers[track]->set("set.force_full_luma", m_properties.value("full_luma").toInt()); + 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++) { @@ -658,7 +691,6 @@ const char *DocClipBase::producerProperty(const char *name) const void DocClipBase::slotRefreshProducer() { if (m_baseTrackProducers.count() == 0) return; - kDebug() << "//////////// REFRESH CLIP !!!!!!!!!!!!!!!!"; if (m_clipType == SLIDESHOW) { /*Mlt::Producer producer(*(m_clipProducer->profile()), getProperty("resource").toUtf8().data()); delete m_clipProducer; @@ -795,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(); } @@ -826,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); @@ -864,7 +908,11 @@ QString DocClipBase::getClipHash() const 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 if (m_clipType == TEXT) hash = QCryptographicHash::hash(QString("title" + getId() + m_properties.value("xmldata")).toUtf8().data(), QCryptographicHash::Md5).toHex(); - else hash = m_properties.value("file_hash"); + else { + if (m_properties.contains("file_hash")) hash = m_properties.value("file_hash"); + if (hash.isEmpty()) hash = getHash(fileURL().path()); + + } return hash; } @@ -1082,65 +1130,19 @@ bool DocClipBase::hasAudioCodec(const QString &codec) const return prod->get(property) == codec; } -void DocClipBase::generateProxy(KUrl proxyFolder) -{ - if (m_proxyThread.isRunning()) return; - QStringList parameters; - parameters << "-i" << m_properties.value("resource"); - QString params = KdenliveSettings::proxyparams().simplified(); - foreach(QString s, params.split(' ')) - parameters << s; - // Make sure we don't block when proxy file already exists - parameters << "-y"; - if (m_properties.value("file_hash").isEmpty()) getFileHash(m_properties.value("resource")); - QString proxydir=proxyFolder.path( KUrl::AddTrailingSlash) + "proxy/"; - KStandardDirs::makeDir(proxydir); - QString path = proxydir + m_properties.value("file_hash") + ".avi"; - setProperty("proxy", path.toUtf8().data()); - if (QFile::exists(path)) { - emit proxyReady(m_id, true); - return; - } - parameters << path; - m_proxyThread = QtConcurrent::run(this, &DocClipBase::slotGenerateProxy, parameters); -} - -void DocClipBase::slotGenerateProxy(QStringList parameters) -{ - QProcess myProcess; - myProcess.start("ffmpeg", parameters); - myProcess.waitForStarted(); - int result = -1; - while (myProcess.state() != QProcess::NotRunning) { - // building proxy file - if (m_abortProxy) { - QString path = getProperty("proxy"); - myProcess.close(); - myProcess.waitForFinished(); - QFile::remove(path); - m_abortProxy = false; - result = 1; - } - myProcess.waitForFinished(500); - } - myProcess.waitForFinished(); - if (result == -1) result = myProcess.exitStatus(); - if (result == 0) emit proxyReady(m_id, true); - else { - clearProperty("proxy"); - emit proxyReady(m_id, false); - } + +void DocClipBase::slotExtractImage(int frame, int frame2) +{ + if (m_thumbProd == NULL) return; + m_thumbProd->extractImage(frame, frame2); } -void DocClipBase::abortProxy() +QPixmap DocClipBase::extractImage(int frame, int width, int height) { - if (m_proxyThread.isRunning()) { - // Proxy is being created, abort - m_abortProxy = true; - } - else { - clearProperty("proxy"); - emit proxyReady(m_id, false); - } + if (m_thumbProd == NULL) return QPixmap(width, height); + QMutexLocker locker(&m_producerMutex); + QPixmap p = m_thumbProd->extractImage(frame, width, height); + return p; } +