X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.cpp;h=154014d68af8c6a565ec26724197b9f8b2816596;hb=6e140f856eeee8a9fd21797b711e93c0846d88fe;hp=f6cfc7c4d03ed89b20f904d64c4ea963313d6d69;hpb=78fe559babbcbaddcc64c6eb6f7e226e78881d52;p=kdenlive diff --git a/src/kthumb.cpp b/src/kthumb.cpp index f6cfc7c4..154014d6 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -20,31 +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 "events.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; @@ -55,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; @@ -78,17 +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) { - QApplication::postEvent(m_parent, new ProgressEvent(val, (QEvent::Type)10005)); - + if (last_val != val && val > 1) { + emit audioThumbProgress(val); 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,101 +106,207 @@ 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(); - } - QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005)); - + } else emit audioThumbOver(); } +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())); -#define _S(a) (a)>255 ? 255 : (a)<0 ? 0 : (a) -#define _R(y,u,v) (0x2568*(y) + 0x3343*(u)) /0x2000 -#define _G(y,u,v) (0x2568*(y) - 0x0c92*(v) - 0x1a1e*(u)) /0x2000 -#define _B(y,u,v) (0x2568*(y) + 0x40cf*(v)) /0x2000 - -KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_producer(NULL), m_dar(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; } -KThumb::~KThumb() { - if (thumbProducer.isRunning()) thumbProducer.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) +{ + // kDebug() << "//extract thumb: " << frame << ", " << frame2; if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return; - int twidth = (int)(KdenliveSettings::trackheight() * m_dar); + const int twidth = (int)(KdenliveSettings::trackheight() * m_dar); + const int theight = KdenliveSettings::trackheight(); + if (m_producer->is_blank()) { - QPixmap pix(twidth, KdenliveSettings::trackheight()); + QPixmap pix(twidth, theight); pix.fill(Qt::black); - emit thumbReady(frame, pix); + if (frame != -1) emit thumbReady(frame, pix); + if (frame2 != -1) emit thumbReady(frame2, pix); return; } + Mlt::Frame *mltFrame; + mlt_image_format format = mlt_image_yuv422; if (frame != -1) { - QPixmap pix = getFrame(*m_producer, frame, twidth, KdenliveSettings::trackheight()); - emit thumbReady(frame, pix); - } + //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); + p.fill(Qt::red); + emit thumbReady(frame, p); + return; + } else { + int frame_width = 0; + int frame_height = 0; + mltFrame->set("normalised_height", theight); + mltFrame->set("normalised_width", twidth); + QPixmap pix(twidth, theight); + uint8_t *data = mltFrame->get_image(format, frame_width, frame_height, 0); + uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4); + mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height); + + QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32); + + if (!image.isNull()) { + pix = QPixmap::fromImage(image.rgbSwapped()); + } else + pix.fill(Qt::red); + + mlt_pool_release(new_image); + delete mltFrame; + emit thumbReady(frame, pix); + } + } else if (frame2 != -1) m_producer->seek(frame2); if (frame2 != -1) { - QPixmap pix = getFrame(*m_producer, frame2, twidth , KdenliveSettings::trackheight()); - emit thumbReady(frame2, pix); + mltFrame = m_producer->get_frame(); + if (!mltFrame) { + kDebug() << "///// BROKEN FRAME"; + QPixmap p(twidth, theight); + p.fill(Qt::red); + emit thumbReady(frame2, p); + return; + } else { + int frame_width = 0; + int frame_height = 0; + mltFrame->set("normalised_height", theight); + mltFrame->set("normalised_width", twidth); + QPixmap pix(twidth, theight); + uint8_t *data = mltFrame->get_image(format, frame_width, frame_height, 0); + uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4); + mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height); + + QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32); + + if (!image.isNull()) { + pix = QPixmap::fromImage(image.rgbSwapped()); + } else + pix.fill(Qt::red); + + mlt_pool_release(new_image); + delete mltFrame; + emit thumbReady(frame2, pix); + } } } +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) { - Mlt::Profile profile((char*) KdenliveSettings::current_profile().data()); +QPixmap KThumb::getImage(KUrl url, int frame, int width, int height) +{ + char *tmp = Render::decodedString(KdenliveSettings::current_profile()); + Mlt::Profile profile(tmp); + delete[] tmp; QPixmap pix(width, height); if (url.isEmpty()) return pix; - char *tmp = Render::decodedString(""); - Mlt::Producer producer(profile, "westley-xml", tmp); + tmp = Render::decodedString(url.path()); + //""); + //Mlt::Producer producer(profile, "xml-string", tmp); + Mlt::Producer *producer = new Mlt::Producer(profile, tmp); delete[] tmp; - if (producer.is_blank()) { - + if (producer->is_blank()) { pix.fill(Qt::black); + delete producer; return pix; } - return getFrame(producer, frame, width, height); + pix = getFrame(producer, frame, width, height); + delete producer; + return pix; } //static +/* QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) { Mlt::Profile profile((char*) KdenliveSettings::current_profile().data()); QPixmap pix(width, height); QDomDocument doc; - QDomElement westley = doc.createElement("westley"); + QDomElement mlt = doc.createElement("mlt"); QDomElement play = doc.createElement("playlist"); - doc.appendChild(westley); - westley.appendChild(play); + doc.appendChild(mlt); + mlt.appendChild(play); play.appendChild(doc.importNode(xml, true)); char *tmp = Render::decodedString(doc.toString()); - Mlt::Producer producer(profile, "westley-xml", tmp); + Mlt::Producer producer(profile, "xml-string", tmp); delete[] tmp; if (producer.is_blank()) { @@ -214,28 +314,42 @@ QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) { return pix; } return getFrame(producer, frame, width, height); -} +}*/ //static -QPixmap KThumb::getFrame(Mlt::Producer producer, int framepos, int width, int height) { - producer.seek(framepos); - Mlt::Frame *frame = producer.get_frame(); +QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height) +{ + if (producer == NULL) { + QPixmap p(width, height); + p.fill(Qt::red); + return p; + } + + producer->seek(framepos); + Mlt::Frame *frame = producer->get_frame(); + if (!frame) { + kDebug() << "///// BROKEN FRAME"; + QPixmap p(width, height); + p.fill(Qt::red); + return p; + } + mlt_image_format format = mlt_image_yuv422; int frame_width = 0; int frame_height = 0; frame->set("normalised_height", height); frame->set("normalised_width", width); QPixmap pix(width, height); - uint8_t *data = frame->get_image(format, frame_width, frame_height, 0); uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4); mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height); + QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32); if (!image.isNull()) { - pix = pix.fromImage(image.rgbSwapped()); + pix = QPixmap::fromImage(image.rgbSwapped()); } else - pix.fill(Qt::black); + pix.fill(Qt::red); mlt_pool_release(new_image); delete frame; @@ -316,21 +430,29 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he emit thumbReady(endframe, image); } */ -void KThumb::stopAudioThumbs() { - if (thumbProducer.isRunning()) thumbProducer.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) { - - if ((thumbProducer.isRunning() && thumbProducer.isWorking()) || channel == 0) { +void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) +{ + if (channel == 0) { + slotAudioThumbOver(); + return; + } + if ((m_audioThumbProducer.isRunning() && m_audioThumbProducer.isWorking())) { return; } @@ -346,6 +468,7 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a if (channelarray.size() != arrayWidth*(frame + frameLength)*m_channels) { kDebug() << "--- BROKEN THUMB FOR: " << m_url.fileName() << " ---------------------- " << endl; f.remove(); + slotAudioThumbOver(); return; } kDebug() << "reading audio thumbs from file"; @@ -358,21 +481,30 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a } } emit audioThumbReady(storeIn); + slotAudioThumbOver(); } else { - if (thumbProducer.isRunning()) return; - thumbProducer.init(this, m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth); - thumbProducer.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::customEvent(QEvent * event) { - if (event->type() == 10005) { - ProgressEvent* p = (ProgressEvent*) event; - m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), p->value()); - } +void KThumb::slotAudioThumbProgress(const int progress) +{ + m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), progress); } +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) +{ + m_clipManager->askForAudioThumb(id); +} #include "kthumb.moc"