X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.cpp;h=3bf19e2841dc28758ee9cd995818923d2c203822;hb=b2f37cecd90d42af8cc8f655462c91cf6624cb01;hp=e1bed87d9e60cccbb53bb091bea5be009e29ec31;hpb=4b3ecf51bd546632d0e451f8d7e20f0e5ffaf90f;p=kdenlive

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index e1bed87d..3bf19e28 100644
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -4,7 +4,7 @@
   begin                : Fri Nov 22 2002
   copyright            : (C) 2002 by Jason Wood
   email                : jasonwood@blueyonder.co.uk
-  copyright            : (C) 2005 Lcio Fl�io Corr�	
+  copyright            : (C) 2005 Lcio Fl�io Corr�
   email                : lucio.correa@gmail.com
   copyright            : (C) Marco Gittler
   email                : g.marco@freenet.de
@@ -20,228 +20,282 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <qapplication.h>
+#include "kthumb.h"
+#include "clipmanager.h"
+#include "renderer.h"
+#include "kdenlivesettings.h"
+
+#include <mlt++/Mlt.h>
 
 #include <kio/netaccess.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kdenlivesettings.h>
 #include <kfileitem.h>
 #include <kmessagebox.h>
-
-#include <mlt++/Mlt.h>
+#include <KStandardDirs>
 
 #include <qxml.h>
-#include <qimage.h>
-
-#include <QThread>
+#include <QImage>
 #include <QApplication>
-#include <QCryptographicHash>
+#include <QtConcurrentRun>
+#include <QVarLengthArray>
+#include <QPainter>
+
+KThumb::KThumb(ClipManager *clipManager, const KUrl &url, const QString &id, const QString &hash, QObject * parent) :
+    QObject(parent),
+    m_url(url),
+    m_thumbFile(),
+    m_dar(1),
+    m_ratio(1),
+    m_producer(NULL),
+    m_clipManager(clipManager),
+    m_id(id)
+{
+    m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+}
 
+KThumb::~KThumb()
+{
+    if (m_producer) m_clipManager->stopThumbs(m_id);
+    m_producer = NULL;
+    m_intraFramesQueue.clear();
+    m_intra.waitForFinished();
+}
 
-#include "renderer.h"
-#include "kthumb.h"
-#include "kdenlivesettings.h"
+void KThumb::setProducer(Mlt::Producer *producer)
+{
+    if (m_producer) m_clipManager->stopThumbs(m_id);
+    m_intraFramesQueue.clear();
+    m_intra.waitForFinished();
+    QMutexLocker lock(&m_mutex);
+    m_producer = producer;
+    // FIXME: the profile() call leaks an object, but trying to free
+    // it leads to a double-free in Profile::~Profile()
+    if (producer) {
+        Mlt::Profile *profile = producer->profile();
+        m_dar = profile->dar();
+        m_ratio = (double) profile->width() / profile->height();
+    }
+}
 
-void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth)
-    {
-	stop_me = false;
-	m_isWorking = false;
-	f.setFileName(target);
-	m_url = url;
-	m_frame = frame;
-	m_frameLength = frameLength;
-	m_frequency = frequency;
-	m_channels = channels;
-	m_arrayWidth = arrayWidth;
+void KThumb::clearProducer()
+{
+    if (m_producer) setProducer(NULL);
+}
 
-    }
+bool KThumb::hasProducer() const
+{
+    return m_producer != NULL;
+}
 
-    bool MyThread::isWorking()
-    {
-	return m_isWorking;
-    }
+void KThumb::updateThumbUrl(const QString &hash)
+{
+    m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+}
 
-    void MyThread::run()
-    {
-		
-		 if (!f.open( QIODevice::WriteOnly )) {
-			kDebug()<<"++++++++  ERROR WRITING TO FILE: "<<f.fileName()<<endl;
-			kDebug()<<"++++++++  DISABLING AUDIO THUMBS"<<endl;
-			//TODO KdenliveSettings::setAudiothumbnails(false);
-			return;
-		}
-		m_isWorking = true;
-		Mlt::Profile prof((char*) KdenliveSettings::current_profile().data());
-		Mlt::Producer m_producer(prof, m_url.path().toAscii().data());
-		
-
-		/*TODO if (KdenliveSettings::normaliseaudiothumbs()) {
-    		    Mlt::Filter m_convert("volume");
-    		    m_convert.set("gain", "normalise");
-    		    m_producer.attach(m_convert);
-		}*/
-
-		/*TODO if (qApp->mainWidget()) 
-		    QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(-1, 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){
-				//TODO QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(val, 10005));
-				last_val=val;
-			}
-				m_producer.seek( z );
-				Mlt::Frame *mlt_frame = m_producer.get_frame();
-				if ( mlt_frame->is_valid() )
-				{
-					double m_framesPerSecond = mlt_producer_get_fps( m_producer.get_producer() ); //mlt_frame->get_double( "fps" );
-					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 ); 
-
-					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++){
-							m_array[i] =  ( (*( m_pcm + c + i * m_samples / m_array.size() )) >> 9 ) +127/2 ;
-						}
-						f.write(m_array);
-						
-					}
-				} else{
-					f.write(QByteArray(m_arrayWidth,'\x00'));
-				}
-				if (mlt_frame)
-					delete mlt_frame;
-		}
-		f.close();
-		m_isWorking = false;
-		if (stop_me) {
-		    f.remove();
-		   //TODO  QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(-1, 10005));
-		}
-		//TODO else QApplication::postEvent(qApp->mainWidget(), new ProgressEvent(0, 10005));
-    }
+void KThumb::updateClipUrl(const KUrl &url, const QString &hash)
+{
+    m_url = url;
+    m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+}
 
+//static
+QPixmap KThumb::getImage(const KUrl& url, int width, int height)
+{
+    if (url.isEmpty()) return QPixmap();
+    return getImage(url, 0, width, height);
+}
 
-#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
+void KThumb::extractImage(const QList<int> &frames)
+{
+    if (!KdenliveSettings::videothumbnails() || m_producer == NULL) return;
+    m_clipManager->slotRequestThumbs(m_id, frames);
+}
 
-KThumb::KThumb(KUrl url, int width, int height, QObject * parent, const char *name):QObject(parent), m_url(url), m_width(width), m_height(height)
+
+void KThumb::getThumb(int frame)
 {
-  kDebug()<<"+++++++++++  CREATING THMB PROD FOR: "<<url;
-  m_profile = new Mlt::Profile((char*) qstrdup(KdenliveSettings::current_profile().toUtf8()));
+    const int theight = Kdenlive::DefaultThumbHeight;
+    const int swidth = (int)(theight * m_ratio + 0.5);
+    const int dwidth = (int)(theight * m_dar + 0.5);
+    QImage img = getProducerFrame(frame, swidth, dwidth, theight);
+    emit thumbReady(frame, img);
 }
 
-KThumb::~KThumb()
+void KThumb::getGenericThumb(int frame, int height, int type)
 {
-    if (m_profile) delete m_profile;
-    if (thumbProducer.isRunning ()) thumbProducer.exit();
+    const int swidth = (int)(height * m_ratio + 0.5);
+    const int dwidth = (int)(height * m_dar + 0.5);
+    QImage img = getProducerFrame(frame, swidth, dwidth, height);
+    m_clipManager->projectTreeThumbReady(m_id, frame, img, type);
 }
 
+QImage KThumb::extractImage(int frame, int width, int height)
+{
+    if (m_producer == NULL) {
+        QImage img(width, height, QImage::Format_ARGB32_Premultiplied);
+        img.fill(QColor(Qt::black).rgb());
+        return img;
+    }
+    return getProducerFrame(frame, (int) (height * m_ratio + 0.5), width, height);
+}
 
 //static
-QPixmap KThumb::getImage(KUrl url, int width, int height)
+QPixmap KThumb::getImage(const KUrl& url, int frame, int width, int height)
 {
-    if (url.isEmpty()) return QPixmap();
+    Mlt::Profile profile(KdenliveSettings::current_profile().toUtf8().constData());
     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 (url.isEmpty()) return pix;
+    Mlt::Producer *producer = new Mlt::Producer(profile, url.path().toUtf8().constData());
+    double swidth = (double) profile.width() / profile.height();
+    pix = QPixmap::fromImage(getFrame(producer, frame, (int) (height * swidth + 0.5), width, height));
+    delete producer;
+    return pix;
+}
 
-    if (m_producer.is_blank()) {
-	pix.fill(Qt::black);
-	return pix;
+
+QImage KThumb::getProducerFrame(int framepos, int frameWidth, int displayWidth, int height)
+{
+    if (m_producer == NULL || !m_producer->is_valid()) {
+        QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied);
+        p.fill(QColor(Qt::red).rgb());
+        return p;
     }
-    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_producer->is_blank()) {
+        QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied);
+        p.fill(QColor(Qt::black).rgb());
+        return p;
     }
-    if (m_frame) delete m_frame;
-    return pix;
+    QMutexLocker lock(&m_mutex);
+    m_producer->seek(framepos);
+    Mlt::Frame *frame = m_producer->get_frame();
+    /*frame->set("rescale.interp", "nearest");
+    frame->set("deinterlace_method", "onefield");
+    frame->set("top_field_first", -1 );*/
+    QImage p = getFrame(frame, frameWidth, displayWidth, height);
+    delete frame;
+    return p;
 }
 
-void KThumb::extractImage(int frame, int frame2)
+//static
+QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int frameWidth, int displayWidth, int height)
 {
-    if (m_url.isEmpty()) return;
-    QPixmap pix(m_width, m_height);
-    char *tmp = Render::decodedString(m_url.path());
-    Mlt::Producer m_producer(*m_profile, tmp);
-    delete tmp;
+    if (producer == NULL || !producer->is_valid()) {
+        QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied);
+        p.fill(QColor(Qt::red).rgb());
+        return p;
+    }
+    if (producer->is_blank()) {
+        QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied);
+        p.fill(QColor(Qt::black).rgb());
+        return p;
+    }
 
-    if (m_producer.is_blank()) {
-	pix.fill(Qt::black);
-	emit thumbReady(frame, pix);
-	return;
+    producer->seek(framepos);
+    Mlt::Frame *frame = producer->get_frame();
+    frame->set("rescale.interp", "nearest");
+    frame->set("deinterlace_method", "onefield");
+    frame->set("top_field_first", -1 );
+    const QImage 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(QColor(Qt::red).rgb());
+        return p;
     }
-    Mlt::Frame * m_frame;
+    
+    int ow = frameWidth;
+    int oh = height;
     mlt_image_format format = mlt_image_rgb24a;
-    Mlt::Filter m_convert(*m_profile, "avcolour_space");
-    m_convert.set("forced", mlt_image_rgb24a);
-    m_producer.attach(m_convert);
-    if (frame != -1) {
-      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, m_width, m_height);
-	QImage image(thumb, m_width, m_height, QImage::Format_ARGB32);
-	if (!image.isNull()) {
-	  pix = pix.fromImage(image);
-	}
-	else pix.fill(Qt::black);
-      }
-      if (m_frame) delete m_frame;
-      emit thumbReady(frame, pix);
-    }
-    if (frame2 == -1) return;
-    m_producer.seek(frame2);
-    m_frame = m_producer.get_frame();
-    if (m_frame && m_frame->is_valid()) {
-      uint8_t *thumb = m_frame->get_image(format, m_width, m_height);
-      QImage image(thumb, m_width, m_height, QImage::Format_ARGB32);
-      if (!image.isNull()) {
-	pix = pix.fromImage(image);
-      }
-      else pix.fill(Qt::black);
+    //frame->set("progressive", "1");
+    if (ow % 2 == 1) ow++;
+    QImage image(ow, oh, QImage::Format_ARGB32_Premultiplied);
+    const uchar* imagedata = frame->get_image(format, ow, oh);
+    if (imagedata == NULL) {
+        p.fill(QColor(Qt::red).rgb());
+        return p;
     }
-    if (m_frame) delete m_frame;
-    emit thumbReady(frame2, pix);
+    memcpy(image.bits(), imagedata, ow * oh * 4);//.byteCount());
+    
+    //const uchar* imagedata = frame->get_image(format, ow, oh);
+    //QImage image(imagedata, ow, oh, QImage::Format_ARGB32_Premultiplied);
+    
+    if (!image.isNull()) {
+        if (ow > (2 * displayWidth)) {
+            // there was a scaling problem, do it manually
+            image = image.scaled(displayWidth, height).rgbSwapped();
+        } else {
+            image = image.scaled(displayWidth, height, Qt::IgnoreAspectRatio).rgbSwapped();
+        }
+#if QT_VERSION >= 0x040800
+	p.fill(QColor(100, 100, 100, 70));
+        QPainter painter(&p);
+#else
+	p.fill(Qt::transparent);
+	QPainter painter(&p);
+	painter.fillRect(p.rect(), QColor(100, 100, 100, 70));
+#endif
+        painter.drawImage(p.rect(), image);
+        painter.end();
+    } else
+        p.fill(QColor(Qt::red).rgb());
+    return p;
+}
 
+//static
+uint KThumb::imageVariance(const QImage &image )
+{
+    uint delta = 0;
+    uint avg = 0;
+    uint bytes = image.numBytes();
+    uint STEPS = bytes/2;
+    QVarLengthArray<uchar> pivot(STEPS);
+    const uchar *bits=image.bits();
+    // First pass: get pivots and taking average
+    for( uint i=0; i<STEPS ; ++i ){
+        pivot[i] = bits[2 * i];
+#if QT_VERSION >= 0x040700
+        avg+=pivot.at(i);
+#else
+        avg+=pivot[i];
+#endif
+    }
+    if (STEPS)
+        avg=avg/STEPS;
+    // Second Step: calculate delta (average?)
+    for (uint i=0; i<STEPS; ++i)
+    {
+#if QT_VERSION >= 0x040700
+        int curdelta=abs(int(avg - pivot.at(i)));
+#else
+        int curdelta=abs(int(avg - pivot[i]));
+#endif
+        delta+=curdelta;
+    }
+    if (STEPS)
+        return delta/STEPS;
+    else
+        return 0;
 }
+
 /*
 void KThumb::getImage(KUrl url, int frame, int width, int height)
 {
     if (url.isEmpty()) return;
     QPixmap image(width, height);
-    char *tmp = KRender::decodedString(url.path());
-    Mlt::Producer m_producer(tmp);
-    delete tmp;
+    Mlt::Producer m_producer(url.path().toUtf8().constData());
     image.fill(Qt::black);
 
     if (m_producer.is_blank()) {
-	emit thumbReady(frame, image);
-	return;
+ emit thumbReady(frame, image);
+ return;
     }
     Mlt::Filter m_convert("avcolour_space");
     m_convert.set("forced", mlt_image_rgb24a);
@@ -252,9 +306,9 @@ void KThumb::getImage(KUrl url, int frame, int width, int height)
     width = width - 2;
     height = height - 2;
     if (m_frame && m_frame->is_valid()) {
-    	uint8_t *thumb = m_frame->get_image(format, width, height);
-    	QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
-    	if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width + 2, height + 2);
+     uint8_t *thumb = m_frame->get_image(format, width, height);
+     QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
+     if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width + 2, height + 2);
     }
     if (m_frame) delete m_frame;
     emit thumbReady(frame, image);
@@ -264,15 +318,13 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
 {
     if (url.isEmpty()) return;
     QPixmap image(width, height);
-    char *tmp = KRender::decodedString(url.path());
-    Mlt::Producer m_producer(tmp);
-    delete tmp;
-    image.fill(Qt::black);
+    Mlt::Producer m_producer(url.path().toUtf8().constData());
+    image.fill(QColor(Qt::black).rgb());
 
     if (m_producer.is_blank()) {
-	emit thumbReady(startframe, image);
-	emit thumbReady(endframe, image);
-	return;
+ emit thumbReady(startframe, image);
+ emit thumbReady(endframe, image);
+ return;
     }
     Mlt::Filter m_convert("avcolour_space");
     m_convert.set("forced", mlt_image_rgb24a);
@@ -284,9 +336,9 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
     height = height - 2;
 
     if (m_frame && m_frame->is_valid()) {
-    	uint8_t *thumb = m_frame->get_image(format, width, height);
-    	QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
-    	if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
+     uint8_t *thumb = m_frame->get_image(format, width, height);
+     QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
+     if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
     }
     if (m_frame) delete m_frame;
     emit thumbReady(startframe, image);
@@ -296,75 +348,60 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
     m_frame = m_producer.get_frame();
 
     if (m_frame && m_frame->is_valid()) {
-    	uint8_t *thumb = m_frame->get_image(format, width, height);
-    	QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
-    	if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
+     uint8_t *thumb = m_frame->get_image(format, width, height);
+     QImage tmpimage(thumb, width, height, 32, NULL, 0, QImage::IgnoreEndian);
+     if (!tmpimage.isNull()) bitBlt(&image, 1, 1, &tmpimage, 0, 0, width - 2, height - 2);
     }
     if (m_frame) delete m_frame;
     emit thumbReady(endframe, image);
 }
 */
-void KThumb::stopAudioThumbs()
+
+void KThumb::slotCreateAudioThumbs()
 {
-	if (thumbProducer.isRunning ()) thumbProducer.stop_me = true;
+    m_clipManager->askForAudioThumb(m_id);
 }
 
-
-void KThumb::removeAudioThumb()
+#if KDE_IS_VERSION(4,5,0)
+void KThumb::queryIntraThumbs(const QList <int> &missingFrames)
 {
-	if (m_thumbFile.isEmpty()) return;
-	stopAudioThumbs();
-	QFile f(m_thumbFile);
-	f.remove();
+    foreach (int i, missingFrames) {
+        if (!m_intraFramesQueue.contains(i)) m_intraFramesQueue.append(i);
+    }
+    qSort(m_intraFramesQueue);
+    if (!m_intra.isRunning()) {
+        m_intra = QtConcurrent::run(this, &KThumb::slotGetIntraThumbs);
+    }
 }
 
-void KThumb::getAudioThumbs(KUrl url, int channel, double frame, double frameLength, int arrayWidth){
-	
-	if ((thumbProducer.isRunning () && thumbProducer.isWorking()) || channel == 0) {
-	    return;
-	}
-	
-	QMap <int, QMap <int, QByteArray> > storeIn;
-       //FIXME: Hardcoded!!! 
-	int m_frequency = 48000;
-	int m_channels = channel;
-	m_thumbFile="/tmp/testfile";
-	if (m_url != url) {
-		m_url = url;
-		QCryptographicHash context(QCryptographicHash::Sha1);
-		context.addData((KFileItem(m_url,"text/plain", S_IFREG).timeString() + m_url.fileName()).toAscii().data());
-		
-		m_thumbFile = KdenliveSettings::currenttmpfolder() + context.result().toHex() + ".thumb";
-		
-	}
-	
-	QFile f(m_thumbFile);
-	if (f.open( QIODevice::ReadOnly )) {
-		QByteArray channelarray = f.readAll();
-		f.close();
-		if (channelarray.size() != arrayWidth*(frame+frameLength)*m_channels) {
-			kDebug()<<"--- BROKEN THUMB FOR: "<<m_url.fileName()<<" ---------------------- "<<endl;
-			f.remove();
-			return;
-		}
-		kDebug() << "reading audio thumbs from file";
-		for (int z=(int) frame;z<(int) (frame+frameLength);z++) {
-			for (int c=0;c< m_channels;c++){
-				QByteArray m_array(arrayWidth,'\x00');
-				for (int i = 0; i < arrayWidth; i++)
-					m_array[i] = channelarray[z*arrayWidth*m_channels + c*arrayWidth + i];
-				storeIn[z][c] = m_array;
-			}
-		}
-		emit audioThumbReady(storeIn);
-	}
-	else {
-		if (thumbProducer.isRunning()) return;
-		thumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
-		thumbProducer.start(QThread::LowestPriority );
-		
-	}
+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), getProducerFrame(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"