m_videoOnlyProducer(NULL),
m_snapMarkers(QList < CommentedTime >()),
m_duration(),
- m_audioTimer(NULL),
m_thumbProd(NULL),
m_audioThumbCreated(false),
m_id(id),
}
if (xml.hasAttribute("cutzones")) {
- QStringList cuts = xml.attribute("cutzones").split(";", QString::SkipEmptyParts);
+ 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));
if (!m_properties.contains("name")) m_properties.insert("name", url.fileName());
m_thumbProd = new KThumb(clipManager, url, m_id, m_properties.value("file_hash"));
- if (m_clipType == AV || m_clipType == AUDIO || m_clipType == PLAYLIST) slotCreateAudioTimer();
+
+ // Setup timer to trigger audio thumbs creation
+ m_audioTimer.setSingleShot(true);
+ m_audioTimer.setInterval(800);
+ connect(&m_audioTimer, SIGNAL(timeout()), m_thumbProd, SLOT(slotCreateAudioThumbs()));
+
}
DocClipBase::~DocClipBase()
{
+ m_audioTimer.stop();
delete m_thumbProd;
- if (m_audioTimer) {
- m_audioTimer->stop();
- delete m_audioTimer;
- }
+ m_thumbProd = NULL;
+ qDeleteAll(m_toDeleteProducers);
+ m_toDeleteProducers.clear();
qDeleteAll(m_baseTrackProducers);
m_baseTrackProducers.clear();
qDeleteAll(m_audioTrackProducers);
return zone;
}
-void DocClipBase::slotCreateAudioTimer()
-{
- connect(m_thumbProd, SIGNAL(audioThumbReady(QMap <int, QMap <int, QByteArray> >)), this , SLOT(updateAudioThumbnail(QMap <int, QMap <int, QByteArray> >)));
- m_audioTimer = new QTimer(this);
- connect(m_audioTimer, SIGNAL(timeout()), this, SLOT(slotGetAudioThumbs()));
-}
-void DocClipBase::askForAudioThumbs()
+bool DocClipBase::hasAudioThumb() const
{
- if (m_thumbProd && m_audioTimer) m_thumbProd->askForAudioThumbs(getId());
+ if (m_clipType == AUDIO || m_clipType == AV || m_clipType == PLAYLIST) return true;
+ return false;
}
void DocClipBase::slotClearAudioCache()
{
- if (m_thumbProd) m_thumbProd->stopAudioThumbs();
- if (m_audioTimer != NULL) m_audioTimer->stop();
m_audioFrameCache.clear();
m_audioThumbCreated = false;
}
return m_id;
}
-void DocClipBase::setId(const QString &newId)
-{
- m_id = newId;
-}
-
const CLIPTYPE & DocClipBase::clipType() const
{
return m_clipType;
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 || m_clipType == PLAYLIST))
- slotCreateAudioTimer();
}
KUrl DocClipBase::fileURL() 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);
}
}
// virtual
-QDomElement DocClipBase::toXML() const
+QDomElement DocClipBase::toXML(bool hideTemporaryProperties) const
{
QDomDocument doc;
QDomElement clip = doc.createElement("producer");
QMapIterator<QString, QString> i(m_properties);
while (i.hasNext()) {
i.next();
+ if (hideTemporaryProperties && i.key().startsWith('_')) continue;
if (!i.value().isEmpty()) clip.setAttribute(i.key(), i.value());
}
doc.appendChild(clip);
m_audioThumbCreated = isDone;
}
-
-void DocClipBase::setThumbnail(const QPixmap & pixmap)
-{
- m_thumbnail = pixmap;
-}
-
-const QPixmap & DocClipBase::thumbnail() const
-{
- return m_thumbnail;
-}
-
-void DocClipBase::updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data)
+void DocClipBase::updateAudioThumbnail(const audioByteArray& data)
{
//kDebug() << "CLIPBASE RECIEDVED AUDIO DATA*********************************************";
m_audioFrameCache = data;
return QString();
}
-void DocClipBase::deleteProducers(bool clearThumbCreator)
+void DocClipBase::clearThumbProducer()
{
- if (clearThumbCreator && m_thumbProd) m_thumbProd->clearProducer();
+ if (m_thumbProd) m_thumbProd->clearProducer();
+}
- delete m_videoOnlyProducer;
- m_videoOnlyProducer = NULL;
+void DocClipBase::reloadThumbProducer()
+{
+ if (m_thumbProd && !m_thumbProd->hasProducer())
+ m_thumbProd->setProducer(getProducer());
+}
- qDeleteAll(m_baseTrackProducers);
+void DocClipBase::deleteProducers()
+{
+ if (m_thumbProd) m_thumbProd->clearProducer();
+
+ if (numReferences() > 0 && (!m_baseTrackProducers.isEmpty() || m_videoOnlyProducer || !m_audioTrackProducers.isEmpty())) {
+ // Clip is used in timeline, delay producers deletion
+ if (m_videoOnlyProducer) m_toDeleteProducers.append(m_videoOnlyProducer);
+ for (int i = 0; i < m_baseTrackProducers.count(); i++) {
+ m_toDeleteProducers.append(m_baseTrackProducers.at(i));
+ }
+ for (int i = 0; i < m_audioTrackProducers.count(); i++) {
+ m_toDeleteProducers.append(m_audioTrackProducers.at(i));
+ }
+ }
+ else {
+ delete m_videoOnlyProducer;
+ qDeleteAll(m_baseTrackProducers);
+ qDeleteAll(m_audioTrackProducers);
+ m_replaceMutex.unlock();
+ }
+ m_videoOnlyProducer = NULL;
m_baseTrackProducers.clear();
- qDeleteAll(m_audioTrackProducers);
m_audioTrackProducers.clear();
}
+void DocClipBase::cleanupProducers()
+{
+ /*
+ int ct = 0;
+ kDebug()<<"----------------------------------------------------------------------------------";
+ for (int i = 0; i < m_toDeleteProducers.count(); i++) {
+ if (m_toDeleteProducers.at(i) != NULL) {
+ Mlt::Properties props(m_toDeleteProducers.at(i)->get_properties());
+ if (props.ref_count() > 2) {
+ kDebug()<<"PRODUCER: "<<i<<", COUNTS: "<<props.ref_count();
+ //exit(1);
+ }
+ ct++;
+ }
+ }*/
+
+ if (!isClean()) {
+ qDeleteAll(m_toDeleteProducers);
+ m_toDeleteProducers.clear();
+ m_replaceMutex.unlock();
+ }
+}
+
+bool DocClipBase::isClean() const
+{
+ return m_toDeleteProducers.isEmpty();
+}
+
void DocClipBase::setValid()
{
m_placeHolder = false;
void DocClipBase::setProducer(Mlt::Producer *producer, bool reset, bool readPropertiesFromProducer)
{
if (producer == NULL) return;
- if (reset) QMutexLocker locker(&m_producerMutex);
+ if (reset) {
+ QMutexLocker locker(&m_producerMutex);
+ m_replaceMutex.lock();
+ deleteProducers();
+ }
+ QString id = producer->get("id");
if (m_placeHolder || !producer->is_valid()) {
char *tmp = qstrdup(i18n("Missing clip").toUtf8().constData());
producer->set("markup", tmp);
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);
+ else if (m_thumbProd && !m_thumbProd->hasProducer()) {
+ if (m_clipType != AUDIO) {
+ if (!id.endsWith("_audio"))
+ m_thumbProd->setProducer(producer);
}
- }
- if (reset) {
- // Clear all previous producers
- kDebug() << "/+++++++++++++++ DELETE ALL PRODS " << producer->get("id");
- deleteProducers(false);
+ else m_thumbProd->setProducer(producer);
+ getAudioThumbs();
}
bool updated = false;
if (id.contains('_')) {
m_audioTrackProducers[pos] = producer;
updated = true;
}
+ else delete producer;
return;
} else if (id.endsWith("video")) {
if (m_videoOnlyProducer == NULL) {
m_videoOnlyProducer = producer;
updated = true;
}
+ else delete producer;
return;
}
int pos = id.toInt();
m_baseTrackProducers[pos] = producer;
updated = true;
}
+ else delete producer;
} else {
if (m_baseTrackProducers.isEmpty()) {
m_baseTrackProducers.append(producer);
m_baseTrackProducers[0] = producer;
updated = true;
}
+ else delete producer;
}
if (updated && readPropertiesFromProducer && (m_clipType != COLOR && m_clipType != IMAGE && m_clipType != TEXT))
setDuration(GenTime(producer->get_length(), KdenliveSettings::project_fps()));
if (i >= m_audioTrackProducers.count()) {
// Could not find a valid producer for that clip
locker.unlock();
- base = producer();
+ base = getProducer();
if (base == NULL) {
return NULL;
}
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());
+ prod->set("id", id.toUtf8().constData());
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")) {
return m_videoOnlyProducer;
}
-Mlt::Producer *DocClipBase::producer(int track)
+Mlt::Producer *DocClipBase::getCloneProducer()
+{
+ Mlt::Producer *source = NULL;
+ Mlt::Producer *prod = NULL;
+ if (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST) {
+ source = getProducer();
+ if (!source) return NULL;
+ }
+ if (m_clipType == COLOR) {
+ prod = new Mlt::Producer(*(source->profile()), 0, QString("colour:" + QString(source->get("resource"))).toUtf8().constData());
+ } else if (m_clipType == TEXT) {
+ prod = new Mlt::Producer(*(source->profile()), 0, QString("kdenlivetitle:" + QString(source->get("resource"))).toUtf8().constData());
+ if (prod && prod->is_valid() && m_properties.contains("xmldata"))
+ prod->set("xmldata", m_properties.value("xmldata").toUtf8().constData());
+ }
+ if (!prod) {
+ if (!source) {
+ QMutexLocker locker(&m_producerMutex);
+ for (int i = 0; i < m_baseTrackProducers.count(); i++) {
+ if (m_baseTrackProducers.at(i) != NULL) {
+ source = m_baseTrackProducers.at(i);
+ break;
+ }
+ }
+ if (!source) return NULL;
+ }
+ prod = cloneProducer(source);
+ }
+ if (prod) {
+ adjustProducerProperties(prod, getId() + "_", false, false);
+ if (!m_properties.contains("proxy_out")) {
+ // Adjust length in case...
+ if (m_properties.contains("duration")) prod->set("length", m_properties.value("duration").toInt());
+ if (m_properties.contains("out"))prod->set("out", m_properties.value("out").toInt());
+ }
+ }
+ return prod;
+}
+
+
+Mlt::Producer *DocClipBase::getProducer(int track)
{
QMutexLocker locker(&m_producerMutex);
if (track == -1 || (m_clipType != AUDIO && m_clipType != AV && m_clipType != PLAYLIST)) {
// 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);
+ Mlt::Producer *prod = cloneProducer(m_baseTrackProducers.at(i));
+ adjustProducerProperties(prod, QString(getId() + '_' + QString::number(track)), false, false);
+ m_baseTrackProducers[track] = prod;
}
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;
+ QString url = QString::fromUtf8(source->get("resource"));
+ if (m_clipType == SLIDESHOW || KIO::NetAccess::exists(KUrl(url), KIO::NetAccess::SourceSide, 0)) {
+ result = new Mlt::Producer(*(source->profile()), url.toUtf8().constData());
}
if (result == NULL || !result->is_valid()) {
// placeholder clip
result = new Mlt::Producer(*source->profile(), tmp);
delete[] tmp;
if (result == NULL || !result->is_valid())
- result = new Mlt::Producer(*source->profile(), "colour:red");
+ result = new Mlt::Producer(*(source->profile()), "colour:red");
else {
result->set("bgcolour", "0xff0000ff");
result->set("pad", "10");
}
+ return result;
}
+ /*Mlt::Properties src_props(source->get_properties());
Mlt::Properties props(result->get_properties());
- Mlt::Properties src_props(source->get_properties());
- props.inherit(src_props);
+ props.inherit(src_props);*/
return result;
}
void DocClipBase::setProducerProperty(const char *name, int data)
{
+ QMutexLocker locker(&m_producerMutex);
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, double data)
{
+ QMutexLocker locker(&m_producerMutex);
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)
{
+ QMutexLocker locker(&m_producerMutex);
for (int i = 0; i < m_baseTrackProducers.count(); i++) {
if (m_baseTrackProducers.at(i) != NULL)
m_baseTrackProducers[i]->set(name, data);
void DocClipBase::resetProducerProperty(const char *name)
{
+ QMutexLocker locker(&m_producerMutex);
for (int i = 0; i < m_baseTrackProducers.count(); i++) {
if (m_baseTrackProducers.at(i) != NULL)
m_baseTrackProducers[i]->set(name, (const char*) NULL);
{
if (m_baseTrackProducers.count() == 0) return;
if (m_clipType == SLIDESHOW) {
- /*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()) {
m_properties.remove(key);
}
-void DocClipBase::getFileHash(const QString url)
+void DocClipBase::getFileHash(const QString &url)
{
if (m_clipType == SLIDESHOW) return;
QFile file(url);
return m_properties;
}
-bool DocClipBase::slotGetAudioThumbs()
+QMap <QString, QString> DocClipBase::currentProperties(QMap <QString, QString> props)
{
- if (m_thumbProd == NULL || isPlaceHolder()) return false;
- if (!KdenliveSettings::audiothumbnails() || m_audioTimer == NULL) {
- if (m_audioTimer != NULL) m_audioTimer->stop();
- return false;
+ QMap <QString, QString> currentProps;
+ QMap<QString, QString>::const_iterator i = props.constBegin();
+ while (i != props.constEnd()) {
+ currentProps.insert(i.key(), m_properties.value(i.key()));
+ ++i;
}
+ return currentProps;
+}
+
+bool DocClipBase::getAudioThumbs()
+{
+ if (m_thumbProd == NULL || isPlaceHolder() || !KdenliveSettings::audiothumbnails()) return false;
if (m_audioThumbCreated) {
- m_audioTimer->stop();
return false;
}
- m_audioTimer->start(1500);
- double lengthInFrames = duration().frames(KdenliveSettings::project_fps());
- m_thumbProd->getAudioThumbs(2, 0, lengthInFrames /*must be number of frames*/, 20);
+ m_audioTimer.start();
return true;
}
}
-void DocClipBase::slotExtractImage(int frame, int frame2)
+void DocClipBase::slotExtractImage(QList <int> frames)
{
if (m_thumbProd == NULL) return;
- m_thumbProd->extractImage(frame, frame2);
+ m_thumbProd->extractImage(frames);
}
-QPixmap DocClipBase::extractImage(int frame, int width, int height)
+QImage DocClipBase::extractImage(int frame, int width, int height)
{
- if (m_thumbProd == NULL) return QPixmap(width, height);
+ if (m_thumbProd == NULL) return QImage();
QMutexLocker locker(&m_producerMutex);
- QPixmap p = m_thumbProd->extractImage(frame, width, height);
- return p;
+ return m_thumbProd->extractImage(frame, width, height);
}
projects / kdenlive / blobdiff