X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.cpp;h=a836be141d614e0e1df2e2d912119a24a45f4539;hb=1089e039028d629791ad426b7b885e53243468c9;hp=12b8403202b5a6c1f0d5c6eb6abf71d5c7d1bd66;hpb=fa66a5ae12ef114f4918840c02f9b3dbb2155064;p=kdenlive diff --git a/src/kthumb.cpp b/src/kthumb.cpp index 12b84032..a836be14 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -20,7 +20,9 @@ * * ***************************************************************************/ -#include +#include +#include +#include #include #include @@ -32,18 +34,11 @@ #include -#include -#include - -#include -#include -#include - #include "clipmanager.h" #include "renderer.h" #include "kthumb.h" #include "kdenlivesettings.h" -#include "events.h" + void MyThread::init(QObject *parent, KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth) { stop_me = false; @@ -63,7 +58,6 @@ bool MyThread::isWorking() { } void MyThread::run() { - if (!f.open(QIODevice::WriteOnly)) { kDebug() << "++++++++ ERROR WRITING TO FILE: " << f.fileName() << endl; kDebug() << "++++++++ DISABLING AUDIO THUMBS" << endl; @@ -90,7 +84,8 @@ void MyThread::run() { 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)); + emit audioThumbProgress(val); + //QApplication::postEvent(m_parent, new ProgressEvent(val, (QEvent::Type)10005)); last_val = val; } @@ -123,129 +118,224 @@ void MyThread::run() { m_isWorking = false; if (stop_me) { f.remove(); - QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005)); - } - QApplication::postEvent(m_parent, new ProgressEvent(0, (QEvent::Type)10005)); + emit audioThumbOver(); + //QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005)); } +KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, 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) { + m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; + connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int))); + connect(&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, int width, int height, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_width(width), m_height(height) { +KThumb::~KThumb() { + if (audioThumbProducer.isRunning()) { + slotAudioThumbOver(); + audioThumbProducer.stop_me = true; + audioThumbProducer.wait(300); + } +} - m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data()); - 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; +void KThumb::setProducer(Mlt::Producer *producer) { + m_producer = producer; + m_dar = producer->profile()->dar(); } -KThumb::~KThumb() { - if (m_profile) delete m_profile; - if (thumbProducer.isRunning()) thumbProducer.exit(); +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) { if (url.isEmpty()) return QPixmap(); - /*QPixmap pix(width, height); - kDebug() << "+++++++++++ GET THMB IMG FOR: " << url; - char *tmp = Render::decodedString(url.path()); - Mlt::Profile prof((char*) KdenliveSettings::current_profile().data()); - Mlt::Producer m_producer(prof, tmp); - delete[] tmp; - - if (m_producer.is_blank()) { - pix.fill(Qt::black); - return pix; - } - Mlt::Frame * m_frame; - mlt_image_format format = mlt_image_rgb24a; - Mlt::Filter m_convert(prof, "avcolour_space"); - m_convert.set("forced", mlt_image_rgb24a); - m_producer.attach(m_convert); - //m_producer.seek(frame); - m_frame = m_producer.get_frame(); - if (m_frame && m_frame->is_valid()) { - uint8_t *thumb = m_frame->get_image(format, width, height); - QImage image(thumb, width, height, QImage::Format_ARGB32); - if (!image.isNull()) { - pix = pix.fromImage(image); - } else pix.fill(Qt::black); - } - if (m_frame) delete m_frame; - return pix;*/ return getImage(url, 0, width, height); } void KThumb::extractImage(int frame, int frame2) { - if (m_url.isEmpty()) return; + if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return; - char *tmp = Render::decodedString(m_url.path()); - Mlt::Producer m_producer(*m_profile, tmp); - delete[] tmp; + const int twidth = (int)(KdenliveSettings::trackheight() * m_dar); + const int theight = KdenliveSettings::trackheight(); - QPixmap pix(m_width, m_height); - if (m_producer.is_blank()) { - QPixmap pix(m_width, m_height); + mlt_image_format format = mlt_image_yuv422; + if (m_producer->is_blank()) { + QPixmap pix(twidth, theight); pix.fill(Qt::black); emit thumbReady(frame, pix); return; } + Mlt::Frame *mltFrame; if (frame != -1) { - QPixmap pix = getFrame(&m_producer, frame, m_width, m_height); - 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, m_width, m_height); - emit thumbReady(frame2, pix); + mltFrame = m_producer->get_frame(); + 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(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 pix(width, height); if (url.isEmpty()) return pix; + char *tmp = Render::decodedString(url.path()); - Mlt::Producer producer(profile, tmp); + //""); + //Mlt::Producer producer(profile, "westley-xml", 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; } -QPixmap KThumb::getFrame(Mlt::Producer* producer, int frame, int width, int height) { +//static +/* +QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) { Mlt::Profile profile((char*) KdenliveSettings::current_profile().data()); - Mlt::Filter m_convert(profile, "avcolour_space"); - m_convert.set("forced", mlt_image_rgb24a); - producer->attach(m_convert); - - producer->seek(frame); - Mlt::Frame * m_frame = producer->get_frame(); - mlt_image_format format = mlt_image_rgb24a; QPixmap pix(width, height); - if (m_frame && m_frame->is_valid()) { - uint8_t *thumb = m_frame->get_image(format, width, height); - QImage image(thumb, width, height, QImage::Format_ARGB32); - if (!image.isNull()) { - pix = pix.fromImage(image); - } else pix.fill(Qt::black); + QDomDocument doc; + QDomElement westley = doc.createElement("westley"); + QDomElement play = doc.createElement("playlist"); + doc.appendChild(westley); + westley.appendChild(play); + play.appendChild(doc.importNode(xml, true)); + char *tmp = Render::decodedString(doc.toString()); + Mlt::Producer producer(profile, "westley-xml", tmp); + delete[] tmp; + + if (producer.is_blank()) { + pix.fill(Qt::black); + return pix; } - if (m_frame) delete m_frame; - return pix; + return getFrame(producer, frame, width, height); +}*/ + +//static +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 = QPixmap::fromImage(image.rgbSwapped()); + } else + pix.fill(Qt::red); + + mlt_pool_release(new_image); + delete frame; + return pix; } /* void KThumb::getImage(KUrl url, int frame, int width, int height) @@ -323,10 +413,9 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he } */ void KThumb::stopAudioThumbs() { - if (thumbProducer.isRunning()) thumbProducer.stop_me = true; + if (audioThumbProducer.isRunning()) audioThumbProducer.stop_me = true; } - void KThumb::removeAudioThumb() { if (m_thumbFile.isEmpty()) return; stopAudioThumbs(); @@ -335,8 +424,11 @@ void KThumb::removeAudioThumb() { } void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) { - - if ((thumbProducer.isRunning() && thumbProducer.isWorking()) || channel == 0) { + if (channel == 0) { + slotAudioThumbOver(); + return; + } + if ((audioThumbProducer.isRunning() && audioThumbProducer.isWorking())) { return; } @@ -352,6 +444,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"; @@ -364,21 +457,27 @@ 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); + 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 << " ................................"; } } -void KThumb::customEvent(QEvent * event) { - if (event->type() == 10005) { - ProgressEvent* p = (ProgressEvent*) event; - m_clipManager->setThumbsProgress(m_url, 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"