#include <qxml.h>
#include <QImage>
#include <QApplication>
+#include <QtConcurrentRun>
void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth)
{
} 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_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()
{
+ m_requestedThumbs.clear();
if (m_audioThumbProducer.isRunning()) {
m_audioThumbProducer.stop_me = true;
m_audioThumbProducer.wait();
slotAudioThumbOver();
}
+ m_future.waitForFinished();
}
void KThumb::setProducer(Mlt::Producer *producer)
void KThumb::extractImage(int frame, int frame2)
{
- // kDebug() << "//extract thumb: " << frame << ", " << frame2;
if (!KdenliveSettings::videothumbnails() || m_producer == NULL) return;
+ if (frame != -1 && !m_requestedThumbs.contains(frame)) m_requestedThumbs.append(frame);
+ if (frame2 != -1 && !m_requestedThumbs.contains(frame2)) m_requestedThumbs.append(frame2);
+ if (!m_future.isRunning()) m_future = QtConcurrent::run(this, &KThumb::doGetThumbs);
+}
+void KThumb::doGetThumbs()
+{
const int twidth = (int)(KdenliveSettings::trackheight() * m_dar);
const int theight = KdenliveSettings::trackheight();
- if (frame != -1) {
- QPixmap pix = getFrame(m_producer, frame, twidth, theight);
- emit thumbReady(frame, pix);
- }
- if (frame2 != -1) {
- QPixmap pix = getFrame(m_producer, frame2, twidth, theight);
- emit thumbReady(frame2, pix);
+ while (!m_requestedThumbs.isEmpty()) {
+ int frame = m_requestedThumbs.takeFirst();
+ if (frame != -1) {
+ QImage img = getFrame(m_producer, frame, twidth, theight);
+ emit thumbReady(frame, img);
+ }
}
}
QPixmap KThumb::extractImage(int frame, int width, int height)
{
- return getFrame(m_producer, frame, width, height);
+ return QPixmap::fromImage(getFrame(m_producer, frame, width, height));
}
//static
Mlt::Producer *producer = new Mlt::Producer(profile, tmp);
delete[] tmp;
- pix = getFrame(producer, frame, width, height);
+ pix = QPixmap::fromImage(getFrame(producer, frame, width, height));
delete producer;
return pix;
}
//static
-QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
+QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
{
- QPixmap p(width, height);
+ QImage p(width, height, QImage::Format_ARGB32);
if (producer == NULL) {
p.fill(Qt::red);
return p;
mlt_service_lock(service.get_service());*/
mlt_image_format format = mlt_image_rgb24a;
- int frame_width = width;
- int frame_height = height;
- uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
- QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
+ uint8_t *data = frame->get_image(format, width, height, 0);
+ QImage image((uchar *)data, width, height, QImage::Format_ARGB32);
//mlt_service_unlock(service.get_service());
if (!image.isNull()) {
- p = QPixmap::fromImage(image.rgbSwapped());
+ p = image.rgbSwapped();
} else
p.fill(Qt::red);
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 << " ................................";
+ // kDebug() << "STARTING GENERATE THMB FOR: " <<m_id<<", URL: "<< m_url << " ................................";
}
}