X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.cpp;h=599f32f5236ac5822bfb7e7293641d81330bb399;hb=a6aafb4cb3d09e17564f60bce207e7678b507a95;hp=8b83045f76d6faf3c0b9acf77022084835ef239b;hpb=cffb34aa7d334ab8cc284c1fd8c10ea59a06b11f;p=kdenlive diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 8b83045f..599f32f5 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -34,6 +34,8 @@ #include +#include + DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) : QObject(), m_audioFrameCache(), @@ -41,7 +43,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin m_baseTrackProducers(), m_audioTrackProducers(), m_videoOnlyProducer(NULL), - m_snapMarkers(), + m_snapMarkers(QList < CommentedTime >()), m_duration(), m_audioTimer(NULL), m_thumbProd(NULL), @@ -62,7 +64,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin 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()); + addCutZone(z.section('-', 0, 0).toInt(), z.section('-', 1, 1).toInt(), z.section('-', 2, 2)); } } @@ -124,9 +126,7 @@ 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; } @@ -140,7 +140,7 @@ void DocClipBase::slotCreateAudioTimer() void DocClipBase::askForAudioThumbs() { - if (m_thumbProd && m_audioTimer) slotGetAudioThumbs(); + if (m_thumbProd && m_audioTimer) m_thumbProd->askForAudioThumbs(getId()); } void DocClipBase::slotClearAudioCache() @@ -273,7 +273,8 @@ QDomElement DocClipBase::toXML() const if (!m_cutZones.isEmpty()) { QStringList cuts; for (int i = 0; i < m_cutZones.size(); i++) { - cuts << QString::number(m_cutZones.at(i).x()) + "-" + QString::number(m_cutZones.at(i).y()); + CutZoneInfo info = m_cutZones.at(i); + cuts << QString::number(info.zone.x()) + "-" + QString::number(info.zone.y()) + "-" + info.description; } clip.setAttribute("cutzones", cuts.join(";")); } @@ -300,7 +301,7 @@ const QPixmap & DocClipBase::thumbnail() const void DocClipBase::updateAudioThumbnail(QMap > data) { - //kDebug() << "CLIPBASE RECIEDVED AUDIO DATA*********************************************"; + //kDebug() << "CLIPBASE RECIEDVED AUDIO DATA*********************************************"; m_audioFrameCache = data; m_audioThumbCreated = true; emit gotAudioData(); @@ -322,10 +323,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) { @@ -432,10 +429,10 @@ void DocClipBase::clearProducers() m_baseTrackProducers.clear(); } -void DocClipBase::deleteProducers() +void DocClipBase::deleteProducers(bool clearThumbCreator) { kDebug() << "// CLIP KILL PRODS ct: " << m_baseTrackProducers.count(); - if (m_thumbProd) m_thumbProd->clearProducer(); + if (clearThumbCreator && m_thumbProd) m_thumbProd->clearProducer(); /*kDebug()<<"// CLIP KILL PRODS ct: "<hasProducer())) m_thumbProd->setProducer(producer); if (reset) { // Clear all previous producers kDebug() << "/+++++++++++++++ DELETE ALL PRODS " << producer->get("id"); - deleteProducers(); + deleteProducers(false); } QString id = producer->get("id"); if (id.contains('_')) { @@ -495,7 +498,6 @@ void DocClipBase::setProducer(Mlt::Producer *producer, bool reset) } //m_clipProducer = producer; //m_clipProducer->set("transparency", m_properties.value("transparency").toInt()); - if (m_thumbProd && (reset || !m_thumbProd->hasProducer())) m_thumbProd->setProducer(producer); } Mlt::Producer *DocClipBase::audioProducer(int track) @@ -509,6 +511,8 @@ Mlt::Producer *DocClipBase::audioProducer(int track) 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("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("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()); @@ -528,6 +532,8 @@ Mlt::Producer *DocClipBase::videoProducer() 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("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("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()); @@ -571,6 +577,8 @@ Mlt::Producer *DocClipBase::producer(int track) } 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("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("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()); @@ -609,6 +617,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++) { @@ -744,6 +760,13 @@ void DocClipBase::getFileHash(const QString url) } } +bool DocClipBase::checkHash() const +{ + KUrl url = fileURL(); + if (!url.isEmpty() && getClipHash() != getHash(url.path())) return false; + return true; +} + QString DocClipBase::getClipHash() const { QString hash; @@ -754,6 +777,11 @@ QString DocClipBase::getClipHash() const return hash; } +void DocClipBase::setPlaceHolder(bool place) +{ + m_placeHolder = place; +} + // static QString DocClipBase::getHash(const QString &path) { @@ -807,9 +835,18 @@ void DocClipBase::setProperty(const QString &key, const QString &value) } else if (key == "force_aspect_ratio") { if (value.isEmpty()) { m_properties.remove("force_aspect_ratio"); - //TODO: find a was to remove the "force_aspect_ratio" property from producer, currently does not work - setProducerProperty("force_aspect_ratio", 0); + resetProducerProperty("force_aspect_ratio"); } else setProducerProperty("force_aspect_ratio", value.toDouble()); + } 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_progressive"); + resetProducerProperty("force_progressive"); + } else setProducerProperty("force_progressive", value.toInt()); } else if (key == "threads") { if (value.isEmpty()) { m_properties.remove("threads"); @@ -855,37 +892,88 @@ bool DocClipBase::isPlaceHolder() const return m_placeHolder; } -void DocClipBase::addCutZone(int in, int out) +void DocClipBase::addCutZone(int in, int out, QString desc) { - if (!m_cutZones.contains(QPoint(in, out))) { - m_cutZones.append(QPoint(in, out)); - } + 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 { - return m_cutZones.contains(p); + 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) { - m_cutZones.removeAll(QPoint(in, 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) +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) == old) { - m_cutZones.replace(i, QPoint(in, out)); + 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 +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; +} +