X-Git-Url: https://git.sesse.net/?p=kdenlive;a=blobdiff_plain;f=src%2Fkthumb.cpp;h=5a81f5481ad789e159b7fdb8ce449faf0ece0773;hp=8fa3d6aaf6de10ca18647af6fbc71a4eb74d4ba3;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hpb=1e007c2d73386e714ed480aba390b827e181994a diff --git a/src/kthumb.cpp b/src/kthumb.cpp index 8fa3d6aa..5a81f548 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -39,49 +39,49 @@ #include #include #include +#include +#include -KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) : +KThumb::KThumb(ClipManager *clipManager, const KUrl &url, const QString &id, const QString &hash, QObject * parent) : QObject(parent), - m_audioThumbProducer(), m_url(url), m_thumbFile(), m_dar(1), + m_ratio(1), m_producer(NULL), m_clipManager(clipManager), - m_id(id), - m_stopAudioThumbs(false) + m_id(id) { m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; } KThumb::~KThumb() { - m_requestedThumbs.clear(); + if (m_producer) m_clipManager->stopThumbs(m_id); + m_producer = NULL; 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(); + if (m_producer) m_clipManager->stopThumbs(m_id); m_intraFramesQueue.clear(); - m_future.waitForFinished(); 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) m_dar = producer->profile()->dar(); + if (producer) { + Mlt::Profile *profile = producer->profile(); + m_dar = profile->dar(); + m_ratio = (double) profile->width() / profile->height(); + } } void KThumb::clearProducer() { - setProducer(NULL); + if (m_producer) setProducer(NULL); } bool KThumb::hasProducer() const @@ -94,109 +94,164 @@ void KThumb::updateThumbUrl(const QString &hash) m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; } -void KThumb::updateClipUrl(KUrl url, const QString &hash) +void KThumb::updateClipUrl(const KUrl &url, const QString &hash) { m_url = url; - //if (m_producer) - //m_producer->set("resource", url.path().toUtf8().constData()); m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb"; } //static -QPixmap KThumb::getImage(KUrl url, int width, int height) +QPixmap KThumb::getImage(const KUrl& url, int width, int height) { if (url.isEmpty()) return QPixmap(); return getImage(url, 0, width, height); } -void KThumb::extractImage(int frame, int frame2) +void KThumb::extractImage(const QList &frames) { 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); + m_clipManager->slotRequestThumbs(m_id, frames); } -void KThumb::doGetThumbs() + +void KThumb::getThumb(int frame) { - const int theight = KdenliveSettings::trackheight(); - const int twidth = FRAME_SIZE;//(int)(theight * m_dar + 0.5); + 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); +} - while (!m_requestedThumbs.isEmpty()) { - int frame = m_requestedThumbs.takeFirst(); - if (frame != -1) { - QImage img = getFrame(m_producer, frame, twidth, theight); - emit thumbReady(frame, img); - } - } +void KThumb::getGenericThumb(int frame, int height, int type) +{ + 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); } -QPixmap KThumb::extractImage(int frame, int width, int height) +QImage KThumb::extractImage(int frame, int width, int height) { - return QPixmap::fromImage(getFrame(m_producer, frame, width, 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 frame, int width, int height) +QPixmap KThumb::getImage(const KUrl& url, int frame, int width, int height) { Mlt::Profile profile(KdenliveSettings::current_profile().toUtf8().constData()); QPixmap pix(width, height); if (url.isEmpty()) return pix; - - //""); - //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; } + +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; + } + if (m_producer->is_blank()) { + QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied); + p.fill(QColor(Qt::black).rgb()); + return p; + } + 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; +} + //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); if (producer == NULL || !producer->is_valid()) { - p.fill(Qt::red); + QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied); + p.fill(QColor(Qt::red).rgb()); return p; } - if (producer->is_blank()) { - p.fill(Qt::black); + QImage p(displayWidth, height, QImage::Format_ARGB32_Premultiplied); + p.fill(QColor(Qt::black).rgb()); return p; } producer->seek(framepos); Mlt::Frame *frame = producer->get_frame(); - if (!frame) { - kDebug() << "///// BROKEN FRAME"; - p.fill(Qt::red); + 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; } - - 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()); - + //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; + } + 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 * 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(); + 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(Qt::red); - - delete frame; + p.fill(QColor(Qt::red).rgb()); return p; } - //static -uint KThumb::imageVariance(QImage image ) +uint KThumb::imageVariance(const QImage &image ) { uint delta = 0; uint avg = 0; @@ -205,7 +260,7 @@ uint KThumb::imageVariance(QImage image ) QVarLengthArray pivot(STEPS); const uchar *bits=image.bits(); // First pass: get pivots and taking average - for( uint i=0; i= 0x040700 avg+=pivot.at(i); @@ -213,9 +268,10 @@ uint KThumb::imageVariance(QImage image ) avg+=pivot[i]; #endif } - avg=avg/STEPS; + if (STEPS) + avg=avg/STEPS; // Second Step: calculate delta (average?) - for (uint i=0; i= 0x040700 int curdelta=abs(int(avg - pivot.at(i))); @@ -224,7 +280,10 @@ uint KThumb::imageVariance(QImage image ) #endif delta+=curdelta; } - return delta/STEPS; + if (STEPS) + return delta/STEPS; + else + return 0; } /* @@ -261,7 +320,7 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he if (url.isEmpty()) return; QPixmap image(width, height); Mlt::Producer m_producer(url.path().toUtf8().constData()); - image.fill(Qt::black); + image.fill(QColor(Qt::black).rgb()); if (m_producer.is_blank()) { emit thumbReady(startframe, image); @@ -298,181 +357,50 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he emit thumbReady(endframe, image); } */ -void KThumb::stopAudioThumbs() -{ - if (m_audioThumbProducer.isRunning()) { - m_stopAudioThumbs = true; - m_audioThumbProducer.waitForFinished(); - slotAudioThumbOver(); - } -} - -void KThumb::removeAudioThumb() -{ - if (m_thumbFile.isEmpty()) return; - stopAudioThumbs(); - QFile f(m_thumbFile); - f.remove(); -} - -void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) -{ - if (channel == 0) { - slotAudioThumbOver(); - return; - } - if (m_audioThumbProducer.isRunning()) { - return; - } - - QMap > storeIn; - //FIXME: Hardcoded!!! - m_frequency = 48000; - m_channels = channel; - - QFile f(m_thumbFile); - if (f.open(QIODevice::ReadOnly)) { - const QByteArray channelarray = f.readAll(); - f.close(); - 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"; - - int h1 = arrayWidth * m_channels; - int h2 = (int) frame * h1; - int h3; - for (int z = (int) frame; z < (int)(frame + frameLength); z++) { - h3 = 0; - for (int c = 0; c < m_channels; c++) { - QByteArray m_array(arrayWidth, '\x00'); - for (int i = 0; i < arrayWidth; i++) { - m_array[i] = channelarray.at(h2 + h3 + i); - } - h3 += arrayWidth; - storeIn[z][c] = m_array; - } - h2 += h1; - } - emit audioThumbReady(storeIn); - slotAudioThumbOver(); - } else { - if (m_audioThumbProducer.isRunning()) return; - m_audioThumbFile.setFileName(m_thumbFile); - m_frame = frame; - m_frameLength = frameLength; - m_arrayWidth = arrayWidth; - m_audioThumbProducer = QtConcurrent::run(this, &KThumb::slotCreateAudioThumbs); - /*m_audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth); - m_audioThumbProducer.start(QThread::LowestPriority);*/ - // kDebug() << "STARTING GENERATE THMB FOR: " < 1) { - m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), val); - last_val = val; - } - producer.seek(z); - Mlt::Frame *mlt_frame = producer.get_frame(); - if (mlt_frame && mlt_frame->is_valid()) { - 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(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 (int i = 0; i < m_array.size(); i++) { - m_array[i] = ((*(m_pcm + c + i * m_samples / m_array.size())) >> 9) + 127 / 2 ; - } - m_audioThumbFile.write(m_array); - - } - } else { - m_audioThumbFile.write(QByteArray(m_arrayWidth, '\x00')); - } - delete mlt_frame; - } - m_audioThumbFile.close(); - if (m_stopAudioThumbs) { - m_audioThumbFile.remove(); - } else { - slotAudioThumbOver(); - } -} - -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); + m_clipManager->askForAudioThumb(m_id); } #if KDE_IS_VERSION(4,5,0) -void KThumb::queryIntraThumbs(int start, int end) +void KThumb::queryIntraThumbs(const QList &missingFrames) { - for (int i = start; i <= end; i++) { + 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); + 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; + // We are in a new thread, so we need a new OpenGL context for the remainder of the function. + QGLWidget ctx(0, m_clipManager->getMainContext()); + ctx.makeCurrent(); + + 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))) { - m_clipManager->pixmapCache->insertImage(path + QString::number(pos), getFrame(m_producer, pos, twidth, theight)); + if (m_clipManager->pixmapCache->insertImage(path + QString::number(pos), getProducerFrame(pos, frameWidth, displayWidth, theight))) { + addedThumbs = true; + } + else kDebug()<<"// INSERT FAILD FOR: "<pixmapCache->findImage(path, &img);