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_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();
+ if (producer) m_dar = producer->profile()->dar();
}
void KThumb::clearProducer()
{
- m_producer = NULL;
+ setProducer(NULL);
}
bool KThumb::hasProducer() const
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";
}
return pix;
}
-
//static
QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
{
QImage p(width, height, QImage::Format_ARGB32_Premultiplied);
- if (producer == NULL) {
+ if (producer == NULL || !producer->is_valid()) {
p.fill(Qt::red);
return p;
}
return p;
}
- /*Mlt::Producer parentProd(producer->parent());
- Mlt::Service service(parentProd.get_service());
- mlt_service_lock(service.get_service());*/
int ow = width;
int oh = height;
mlt_image_format format = mlt_image_rgb24a;
//static
uint KThumb::imageVariance(QImage image )
{
- uint delta=0;
- uint avg=0;
- uint bytes=image.numBytes();
- uint STEPS=bytes/2;
+ uint delta = 0;
+ uint avg = 0;
+ uint bytes = image.numBytes();
+ uint STEPS = bytes/2;
QVarLengthArray<uchar> pivot(STEPS);
- uchar *bits=image.bits();
+ const uchar *bits=image.bits();
// First pass: get pivots and taking average
for( uint i=0; i<STEPS ; i++ ){
- pivot[i]=bits[i*(bytes/STEPS)];
+ pivot[i] = bits[2 * i];
+#if QT_VERSION >= 0x040700
+ avg+=pivot.at(i);
+#else
avg+=pivot[i];
+#endif
}
avg=avg/STEPS;
// Second Step: calculate delta (average?)
for (uint i=0; i<STEPS; i++)
{
- int curdelta=abs(int(avg-pivot[i]));
+#if QT_VERSION >= 0x040700
+ int curdelta=abs(int(avg - pivot.at(i)));
+#else
+ int curdelta=abs(int(avg - pivot[i]));
+#endif
delta+=curdelta;
}
return delta/STEPS;
void KThumb::slotCreateAudioThumbs()
{
Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().data());
- Mlt::Producer m_producer(prof, m_url.path().toUtf8().data());
- if (!m_producer.is_valid()) {
+ Mlt::Producer producer(prof, m_url.path().toUtf8().data());
+ if (!producer.is_valid()) {
kDebug() << "++++++++ INVALID CLIP: " << m_url.path();
return;
}
if (KdenliveSettings::normaliseaudiothumbs()) {
Mlt::Filter m_convert(prof, "volume");
m_convert.set("gain", "normalise");
- m_producer.attach(m_convert);
+ producer.attach(m_convert);
}
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++) {
+ for (int z = (int) m_frame; z < (int)(m_frame + m_frameLength) && producer.is_valid(); z++) {
if (m_stopAudioThumbs) break;
val = (int)((z - m_frame) / (m_frame + m_frameLength) * 100.0);
if (last_val != val && val > 1) {
m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), val);
last_val = val;
}
- m_producer.seek(z);
- Mlt::Frame *mlt_frame = m_producer.get_frame();
+ producer.seek(z);
+ Mlt::Frame *mlt_frame = producer.get_frame();
if (mlt_frame && mlt_frame->is_valid()) {
- double m_framesPerSecond = mlt_producer_get_fps(m_producer.get_producer());
+ double m_framesPerSecond = mlt_producer_get_fps(producer.get_producer());
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;
qint16* m_pcm = static_cast<qint16*>(mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples));
m_clipManager->askForAudioThumb(id);
}
+#if KDE_IS_VERSION(4,5,0)
+void KThumb::queryIntraThumbs(int start, int end)
+{
+ for (int i = start; i <= end; i++) {
+ 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::slotGetIntraThumbs()
+{
+ int theight = KdenliveSettings::trackheight();
+ int twidth = FRAME_SIZE;
+ QString path = m_url.path() + "_";
+ QImage img;
+
+ while (!m_intraFramesQueue.isEmpty()) {
+ int pos = m_intraFramesQueue.takeFirst();
+ if (!m_clipManager->pixmapCache->contains(path + QString::number(pos))) {
+ m_clipManager->pixmapCache->insertImage(path + QString::number(pos), getFrame(m_producer, pos, twidth, theight));
+ }
+ m_intraFramesQueue.removeAll(pos);
+ }
+ 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