m_url(url),
m_thumbFile(),
m_dar(1),
+ m_ratio(1),
m_producer(NULL),
m_clipManager(clipManager),
m_id(id),
KThumb::~KThumb()
{
m_requestedThumbs.clear();
+ m_intraFramesQueue.clear();
if (m_audioThumbProducer.isRunning()) {
m_stopAudioThumbs = true;
m_audioThumbProducer.waitForFinished();
slotAudioThumbOver();
}
m_future.waitForFinished();
+ m_intra.waitForFinished();
}
void KThumb::setProducer(Mlt::Producer *producer)
{
m_requestedThumbs.clear();
+ m_intraFramesQueue.clear();
m_future.waitForFinished();
+ m_intra.waitForFinished();
+ m_mutex.lock();
m_producer = producer;
+ m_mutex.unlock();
// FIXME: the profile() call leaks an object, but trying to free
// it leads to a double-free in Profile::~Profile()
- if (producer) m_dar = producer->profile()->dar();
+ if (producer) {
+ m_dar = producer->profile()->dar();
+ m_ratio = (double) producer->profile()->width() / producer->profile()->height();
+ }
+
}
void KThumb::clearProducer()
void KThumb::updateClipUrl(KUrl url, const QString &hash)
{
m_url = url;
- if (m_producer)
- m_producer->set("resource", url.path().toUtf8().constData());
+ //if (m_producer)
+ //m_producer->set("resource", url.path().toUtf8().constData());
m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
}
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);
+ if (!m_future.isRunning()) {
+ m_mutex.lock();
+ m_future = QtConcurrent::run(this, &KThumb::doGetThumbs);
+ m_mutex.unlock();
+ }
}
void KThumb::doGetThumbs()
{
const int theight = KdenliveSettings::trackheight();
- const int twidth = FRAME_SIZE;//(int)(theight * m_dar + 0.5);
+ const int swidth = (int)(theight * m_ratio + 0.5);
+ const int dwidth = (int)(theight * m_dar + 0.5);
while (!m_requestedThumbs.isEmpty()) {
int frame = m_requestedThumbs.takeFirst();
if (frame != -1) {
- QImage img = getFrame(m_producer, frame, twidth, theight);
- emit thumbReady(frame, img);
+ emit thumbReady(frame, getFrame(m_producer, frame, swidth, dwidth, theight));
}
}
}
QPixmap KThumb::extractImage(int frame, int width, int height)
{
- return QPixmap::fromImage(getFrame(m_producer, frame, width, height));
+ m_mutex.lock();
+ QImage img = getFrame(m_producer, frame, (int) (height * m_ratio + 0.5), width, height);
+ m_mutex.unlock();
+ return QPixmap::fromImage(img);
}
//static
//"<mlt><playlist><producer resource=\"" + url.path() + "\" /></playlist></mlt>");
//Mlt::Producer producer(profile, "xml-string", tmp);
Mlt::Producer *producer = new Mlt::Producer(profile, url.path().toUtf8().constData());
-
- pix = QPixmap::fromImage(getFrame(producer, frame, width, height));
+ double swidth = (double) profile.width() / profile.height();
+ pix = QPixmap::fromImage(getFrame(producer, frame, (int) (height * swidth + 0.5), width, height));
delete producer;
return pix;
}
-
//static
-QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
+QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int frameWidth, int displayWidth, int height)
{
- QImage p(width, height, QImage::Format_ARGB32_Premultiplied);
+ QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied);
if (producer == NULL || !producer->is_valid()) {
p.fill(Qt::red);
return p;
producer->seek(framepos);
Mlt::Frame *frame = producer->get_frame();
- if (!frame) {
- kDebug() << "///// BROKEN FRAME";
+ p = getFrame(frame, frameWidth, displayWidth, height);
+ delete frame;
+ return p;
+}
+
+
+//static
+QImage KThumb::getFrame(Mlt::Frame *frame, int frameWidth, int displayWidth, int height)
+{
+ QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied);
+ if (frame == NULL || !frame->is_valid()) {
p.fill(Qt::red);
return p;
}
- /*Mlt::Producer parentProd(producer->parent());
- Mlt::Service service(parentProd.get_service());
- mlt_service_lock(service.get_service());*/
- int ow = width;
+ int ow = frameWidth;
int oh = height;
mlt_image_format format = mlt_image_rgb24a;
uint8_t *data = frame->get_image(format, ow, oh, 0);
QImage image((uchar *)data, ow, oh, QImage::Format_ARGB32_Premultiplied);
- //mlt_service_unlock(service.get_service());
-
if (!image.isNull()) {
- if (ow > (2 * width)) {
+ if (ow > (2 * displayWidth)) {
// there was a scaling problem, do it manually
- QImage scaled = image.scaled(width, height);
- p = scaled.rgbSwapped();
- } else p = image.rgbSwapped();
+ QImage scaled = image.scaled(displayWidth, height);
+ image = scaled.rgbSwapped();
+ } else {
+ image = image.scaled(displayWidth, height, Qt::IgnoreAspectRatio).rgbSwapped();
+ }
+ QPainter painter(&p);
+ painter.fillRect(p.rect(), Qt::black);
+ painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+ painter.drawImage(p.rect(), image);
+ painter.end();
} else
p.fill(Qt::red);
-
- delete frame;
return p;
}
-
//static
uint KThumb::imageVariance(QImage image )
{
m_clipManager->askForAudioThumb(id);
}
+#if KDE_IS_VERSION(4,5,0)
+void KThumb::queryIntraThumbs(QList <int> missingFrames)
+{
+ foreach (int i, missingFrames) {
+ if (!m_intraFramesQueue.contains(i)) m_intraFramesQueue.append(i);
+ }
+ qSort(m_intraFramesQueue);
+ if (!m_intra.isRunning()) {
+ m_mutex.lock();
+ m_intra = QtConcurrent::run(this, &KThumb::slotGetIntraThumbs);
+ m_mutex.unlock();
+ }
+}
+
+void KThumb::slotGetIntraThumbs()
+{
+ const int theight = KdenliveSettings::trackheight();
+ const int frameWidth = (int)(theight * m_ratio + 0.5);
+ const int displayWidth = (int)(theight * m_dar + 0.5);
+ QString path = m_url.path() + "_";
+ bool addedThumbs = false;
+
+ while (!m_intraFramesQueue.isEmpty()) {
+ int pos = m_intraFramesQueue.takeFirst();
+ if (!m_clipManager->pixmapCache->contains(path + QString::number(pos))) {
+ if (m_clipManager->pixmapCache->insertImage(path + QString::number(pos), getFrame(m_producer, pos, frameWidth, displayWidth, theight))) {
+ addedThumbs = true;
+ }
+ else kDebug()<<"// INSERT FAILD FOR: "<<pos;
+ }
+ m_intraFramesQueue.removeAll(pos);
+ }
+ if (addedThumbs) emit thumbsCached();
+}
+
+QImage KThumb::findCachedThumb(const QString path)
+{
+ QImage img;
+ m_clipManager->pixmapCache->findImage(path, &img);
+ return img;
+}
+#endif
#include "kthumb.moc"
projects / kdenlive / blobdiff