X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.cpp;h=8f1cf8f247aba057aac43057c93ef27c40f493ca;hb=982e28b36ad958735f227c4fb29dcbe447f1abb0;hp=573d379011eb04ae408789439bf92847d953ffa2;hpb=e6a39bd6cb5144054f1015ec66d433e8e97cc6b9;p=kdenlive diff --git a/src/kthumb.cpp b/src/kthumb.cpp index 573d3790..8f1cf8f2 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -20,30 +20,27 @@ * * ***************************************************************************/ -#include -#include -#include -#include +#include "kthumb.h" +#include "clipmanager.h" +#include "renderer.h" +#include "kdenlivesettings.h" + +#include #include #include #include -#include #include #include #include -#include - -#include "clipmanager.h" -#include "renderer.h" -#include "kthumb.h" -#include "kdenlivesettings.h" - +#include +#include +#include -void MyThread::init(QObject *parent, KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth) { +void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth) +{ stop_me = false; - m_parent = parent; m_isWorking = false; f.setFileName(target); m_url = url; @@ -54,12 +51,13 @@ void MyThread::init(QObject *parent, KUrl url, QString target, double frame, dou m_arrayWidth = arrayWidth; } -bool MyThread::isWorking() { +bool MyThread::isWorking() +{ return m_isWorking; } -void MyThread::run() { - +void MyThread::run() +{ if (!f.open(QIODevice::WriteOnly)) { kDebug() << "++++++++ ERROR WRITING TO FILE: " << f.fileName() << endl; kDebug() << "++++++++ DISABLING AUDIO THUMBS" << endl; @@ -77,18 +75,14 @@ void MyThread::run() { m_producer.attach(m_convert); } - //QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005)); - int last_val = 0; int val = 0; kDebug() << "for " << m_frame << " " << m_frameLength << " " << m_producer.is_valid(); for (int z = (int) m_frame;z < (int)(m_frame + m_frameLength) && m_producer.is_valid();z++) { if (stop_me) break; val = (int)((z - m_frame) / (m_frame + m_frameLength) * 100.0); - if (last_val != val & val > 1) { + if (last_val != val && val > 1) { emit audioThumbProgress(val); - //QApplication::postEvent(m_parent, new ProgressEvent(val, (QEvent::Type)10005)); - last_val = val; } m_producer.seek(z); @@ -98,12 +92,12 @@ void MyThread::run() { int m_samples = mlt_sample_calculator(m_framesPerSecond, m_frequency, mlt_frame_get_position(mlt_frame->get_frame())); mlt_audio_format m_audioFormat = mlt_audio_pcm; - int16_t* m_pcm = mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples); + qint16* m_pcm = mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples); for (int c = 0;c < m_channels;c++) { QByteArray m_array; m_array.resize(m_arrayWidth); - for (uint i = 0; i < m_array.size(); i++) { + for (int i = 0; i < m_array.size(); i++) { m_array[i] = ((*(m_pcm + c + i * m_samples / m_array.size())) >> 9) + 127 / 2 ; } f.write(m_array); @@ -112,59 +106,89 @@ void MyThread::run() { } else { f.write(QByteArray(m_arrayWidth, '\x00')); } - if (mlt_frame) - delete mlt_frame; + delete mlt_frame; } - kDebug() << "done"; + //kDebug() << "done"; f.close(); m_isWorking = false; if (stop_me) { f.remove(); - } - emit audioThumbOver(); - //QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005)); - + } else emit audioThumbOver(); } -KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_id(id), m_producer(NULL), m_dar(1), m_mainFrame(-1) { - QCryptographicHash context(QCryptographicHash::Sha1); - context.addData((KFileItem(m_url, "text/plain", S_IFREG).timeString() + m_url.fileName()).toAscii().data()); - m_thumbFile = KGlobal::dirs()->saveLocation("tmp" , "kdenlive") + context.result().toHex() + ".thumb"; - //kDebug() << "thumbfile=" << m_thumbFile; - connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int))); - connect(&audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver())); +KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) : + QObject(parent), + m_audioThumbProducer(), + m_url(url), + m_thumbFile(), + m_dar(1), + m_producer(NULL), + m_clipManager(clipManager), + m_id(id) +{ + m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; + connect(&m_audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int))); + connect(&m_audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver())); } -KThumb::~KThumb() { - if (audioThumbProducer.isRunning()) audioThumbProducer.exit(); +KThumb::~KThumb() +{ + if (m_audioThumbProducer.isRunning()) { + m_audioThumbProducer.stop_me = true; + m_audioThumbProducer.wait(); + slotAudioThumbOver(); + } } -void KThumb::setProducer(Mlt::Producer *producer) { +void KThumb::setProducer(Mlt::Producer *producer) +{ m_producer = producer; + // FIXME: the profile() call leaks an object, but trying to free + // it leads to a double-free in Profile::~Profile() m_dar = producer->profile()->dar(); } -void KThumb::updateClipUrl(KUrl url) { +void KThumb::clearProducer() +{ + m_producer = NULL; +} + +bool KThumb::hasProducer() const +{ + return m_producer != NULL; +} + +void KThumb::updateThumbUrl(const QString &hash) +{ + m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; +} + +void KThumb::updateClipUrl(KUrl url, const QString &hash) +{ m_url = url; if (m_producer) { char *tmp = Render::decodedString(url.path()); m_producer->set("resource", tmp); delete[] tmp; } + m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; } //static -QPixmap KThumb::getImage(KUrl url, int width, int height) { +QPixmap KThumb::getImage(KUrl url, int width, int height) +{ if (url.isEmpty()) return QPixmap(); return getImage(url, 0, width, height); } -void KThumb::extractImage(int frame, int frame2) { +void KThumb::extractImage(int frame, int frame2) +{ if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return; const int twidth = (int)(KdenliveSettings::trackheight() * m_dar); const int theight = KdenliveSettings::trackheight(); + mlt_image_format format = mlt_image_yuv422; if (m_producer->is_blank()) { QPixmap pix(twidth, theight); @@ -177,6 +201,7 @@ void KThumb::extractImage(int frame, int frame2) { //videoThumbProducer.getThumb(frame); m_producer->seek(frame); mltFrame = m_producer->get_frame(); + if (frame2 != -1) m_producer->seek(frame2); if (!mltFrame) { kDebug() << "///// BROKEN FRAME"; QPixmap p(twidth, theight); @@ -184,7 +209,6 @@ void KThumb::extractImage(int frame, int frame2) { emit thumbReady(frame, p); return; } else { - if (frame2 != -1) m_producer->seek(frame2); int frame_width = 0; int frame_height = 0; mltFrame->set("normalised_height", theight); @@ -238,12 +262,14 @@ void KThumb::extractImage(int frame, int frame2) { } } -QPixmap KThumb::extractImage(int frame, int width, int height) { +QPixmap KThumb::extractImage(int frame, int width, int height) +{ return getFrame(m_producer, frame, width, height); } //static -QPixmap KThumb::getImage(KUrl url, int frame, int width, int height) { +QPixmap KThumb::getImage(KUrl url, int frame, int width, int height) +{ Mlt::Profile profile((char*) KdenliveSettings::current_profile().data()); QPixmap pix(width, height); if (url.isEmpty()) return pix; @@ -287,7 +313,8 @@ QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) { }*/ //static -QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height) { +QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height) +{ if (producer == NULL) { QPixmap p(width, height); p.fill(Qt::red); @@ -399,23 +426,29 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he emit thumbReady(endframe, image); } */ -void KThumb::stopAudioThumbs() { - if (audioThumbProducer.isRunning()) audioThumbProducer.stop_me = true; +void KThumb::stopAudioThumbs() +{ + if (m_audioThumbProducer.isRunning()) { + m_audioThumbProducer.stop_me = true; + slotAudioThumbOver(); + } } -void KThumb::removeAudioThumb() { +void KThumb::removeAudioThumb() +{ if (m_thumbFile.isEmpty()) return; stopAudioThumbs(); QFile f(m_thumbFile); f.remove(); } -void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) { +void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) +{ if (channel == 0) { slotAudioThumbOver(); return; } - if ((audioThumbProducer.isRunning() && audioThumbProducer.isWorking())) { + if ((m_audioThumbProducer.isRunning() && m_audioThumbProducer.isWorking())) { return; } @@ -446,23 +479,26 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a emit audioThumbReady(storeIn); slotAudioThumbOver(); } else { - if (audioThumbProducer.isRunning()) return; - audioThumbProducer.init(this, m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth); - audioThumbProducer.start(QThread::LowestPriority); - kDebug() << "STARTING GENERATE THMB FOR: " << m_url << " ................................"; + if (m_audioThumbProducer.isRunning()) return; + m_audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth); + m_audioThumbProducer.start(QThread::LowestPriority); + kDebug() << "STARTING GENERATE THMB FOR: " << m_url << " ................................"; } } -void KThumb::slotAudioThumbProgress(const int progress) { +void KThumb::slotAudioThumbProgress(const int progress) +{ m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), progress); } -void KThumb::slotAudioThumbOver() { +void KThumb::slotAudioThumbOver() +{ m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), -1); m_clipManager->endAudioThumbsGeneration(m_id); } -void KThumb::askForAudioThumbs(const QString &id) { +void KThumb::askForAudioThumbs(const QString &id) +{ m_clipManager->askForAudioThumb(id); }