]> git.sesse.net Git - kdenlive/blobdiff - src/kthumb.cpp
[PATCH by Ray Lehtiniemi] Fix up &&/& confusion
[kdenlive] / src / kthumb.cpp
index a881ec606480b04db78a844032658f8292c40663..6f21286314dfd176407e6c996deaf450cb3376f6 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#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 <KStandardDirs>
 
-#include <mlt++/Mlt.h>
-
 #include <qxml.h>
-#include <qimage.h>
-
-#include <QThread>
+#include <QImage>
 #include <QApplication>
-#include <QCryptographicHash>
-
-#include "clipmanager.h"
-#include "renderer.h"
-#include "kthumb.h"
-#include "kdenlivesettings.h"
-#include "events.h"
 
 void MyThread::init(QObject *parent, KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth) {
     stop_me = false;
@@ -61,7 +56,6 @@ bool MyThread::isWorking() {
 }
 
 void MyThread::run() {
-
     if (!f.open(QIODevice::WriteOnly)) {
         kDebug() << "++++++++  ERROR WRITING TO FILE: " << f.fileName() << endl;
         kDebug() << "++++++++  DISABLING AUDIO THUMBS" << endl;
@@ -87,8 +81,9 @@ void MyThread::run() {
     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) {
-            QApplication::postEvent(m_parent, new ProgressEvent(val, (QEvent::Type)10005));
+        if (last_val != val && val > 1) {
+            emit audioThumbProgress(val);
+            //QApplication::postEvent(m_parent, new ProgressEvent(val, (QEvent::Type)10005));
 
             last_val = val;
         }
@@ -99,7 +94,7 @@ void MyThread::run() {
             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);
+            qint16* 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;
@@ -122,36 +117,51 @@ void MyThread::run() {
     if (stop_me) {
         f.remove();
     }
-    QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005));
+    emit audioThumbOver();
+    //QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005));
 
 }
 
+KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_id(id), m_producer(NULL), m_dar(1), m_mainFrame(-1) {
+    m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+    connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
+    connect(&audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
 
-#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
-
-KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_producer(NULL) {
-
-    m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
-    QCryptographicHash context(QCryptographicHash::Sha1);
-    context.addData((KFileItem(m_url, "text/plain", S_IFREG).timeString() + m_url.fileName()).toAscii().data());
-    m_thumbFile = KGlobal::dirs()->saveLocation("tmp" , "kdenlive") + context.result().toHex() + ".thumb";
-    kDebug() << "thumbfile=" << m_thumbFile;
 }
 
 KThumb::~KThumb() {
-    if (m_profile) delete m_profile;
-    if (thumbProducer.isRunning()) thumbProducer.exit();
+    if (audioThumbProducer.isRunning()) {
+        slotAudioThumbOver();
+        audioThumbProducer.stop_me = true;
+        audioThumbProducer.wait(300);
+    }
 }
 
 void KThumb::setProducer(Mlt::Producer *producer) {
     m_producer = producer;
+    m_dar = producer->profile()->dar();
+}
+
+void KThumb::clearProducer() {
+    m_producer = NULL;
 }
 
-void KThumb::updateClipUrl(KUrl url) {
+bool KThumb::hasProducer() const {
+    return m_producer != NULL;
+}
+
+void KThumb::updateThumbUrl(const QString &hash) {
+    m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
+}
+
+void KThumb::updateClipUrl(KUrl url, const QString &hash) {
     m_url = url;
+    if (m_producer) {
+        char *tmp = Render::decodedString(url.path());
+        m_producer->set("resource", tmp);
+        delete[] tmp;
+    }
+    m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
 }
 
 //static
@@ -161,48 +171,112 @@ QPixmap KThumb::getImage(KUrl url, int width, int height) {
 }
 
 void KThumb::extractImage(int frame, int frame2) {
-    if (m_url.isEmpty()) return;
-    if (m_producer == NULL) return;
-    /*char *tmp = Render::decodedString("<westley><playlist><producer resource=\"" + m_url.path() + "\" /></playlist></westley>");
-    Mlt::Producer producer(*m_profile, "westley-xml", tmp);
-    delete[] tmp;*/
+    if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return;
 
-    int twidth = (int)(KdenliveSettings::trackheight() * m_profile->dar());
+    const int twidth = (int)(KdenliveSettings::trackheight() * m_dar);
+    const int theight = KdenliveSettings::trackheight();
+
+    mlt_image_format format = mlt_image_yuv422;
     if (m_producer->is_blank()) {
-        QPixmap pix(twidth, KdenliveSettings::trackheight());
+        QPixmap pix(twidth, theight);
         pix.fill(Qt::black);
         emit thumbReady(frame, pix);
         return;
     }
+    Mlt::Frame *mltFrame;
     if (frame != -1) {
-        QPixmap pix = getFrame(*m_producer, frame, twidth, KdenliveSettings::trackheight());
-        emit thumbReady(frame, pix);
-    }
+        //videoThumbProducer.getThumb(frame);
+        m_producer->seek(frame);
+        mltFrame = m_producer->get_frame();
+        if (frame2 != -1) m_producer->seek(frame2);
+        if (!mltFrame) {
+            kDebug() << "///// BROKEN FRAME";
+            QPixmap p(twidth, theight);
+            p.fill(Qt::red);
+            emit thumbReady(frame, p);
+            return;
+        } else {
+            int frame_width = 0;
+            int frame_height = 0;
+            mltFrame->set("normalised_height", theight);
+            mltFrame->set("normalised_width", twidth);
+            QPixmap pix(twidth, theight);
+            uint8_t *data = mltFrame->get_image(format, frame_width, frame_height, 0);
+            uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4);
+            mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height);
+
+            QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
+
+            if (!image.isNull()) {
+                pix = QPixmap::fromImage(image.rgbSwapped());
+            } else
+                pix.fill(Qt::red);
+
+            mlt_pool_release(new_image);
+            delete mltFrame;
+            emit thumbReady(frame, pix);
+        }
+    } else if (frame2 != -1) m_producer->seek(frame2);
     if (frame2 != -1) {
-        QPixmap pix = getFrame(*m_producer, frame2, twidth , KdenliveSettings::trackheight());
-        emit thumbReady(frame2, pix);
+        mltFrame = m_producer->get_frame();
+        if (!mltFrame) {
+            kDebug() << "///// BROKEN FRAME";
+            QPixmap p(twidth, theight);
+            p.fill(Qt::red);
+            emit thumbReady(frame, p);
+            return;
+        } else {
+            int frame_width = 0;
+            int frame_height = 0;
+            mltFrame->set("normalised_height", theight);
+            mltFrame->set("normalised_width", twidth);
+            QPixmap pix(twidth, theight);
+            uint8_t *data = mltFrame->get_image(format, frame_width, frame_height, 0);
+            uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4);
+            mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height);
+
+            QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
+
+            if (!image.isNull()) {
+                pix = QPixmap::fromImage(image.rgbSwapped());
+            } else
+                pix.fill(Qt::red);
+
+            mlt_pool_release(new_image);
+            delete mltFrame;
+            emit thumbReady(frame2, pix);
+        }
     }
 }
 
+QPixmap KThumb::extractImage(int frame, int width, int height) {
+    return getFrame(m_producer, frame, width, height);
+}
+
 //static
 QPixmap KThumb::getImage(KUrl url, int frame, int width, int height) {
     Mlt::Profile profile((char*) KdenliveSettings::current_profile().data());
     QPixmap pix(width, height);
     if (url.isEmpty()) return pix;
 
-    char *tmp = Render::decodedString("<westley><playlist><producer resource=\"" + url.path() + "\" /></playlist></westley>");
-    Mlt::Producer producer(profile, "westley-xml", tmp);
+    char *tmp = Render::decodedString(url.path());
+    //"<westley><playlist><producer resource=\"" + url.path() + "\" /></playlist></westley>");
+    //Mlt::Producer producer(profile, "westley-xml", tmp);
+    Mlt::Producer *producer = new Mlt::Producer(profile, tmp);
     delete[] tmp;
 
-    if (producer.is_blank()) {
-
+    if (producer->is_blank()) {
         pix.fill(Qt::black);
+        delete producer;
         return pix;
     }
-    return getFrame(producer, frame, width, height);
+    pix = getFrame(producer, frame, width, height);
+    delete producer;
+    return pix;
 }
 
 //static
+/*
 QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) {
     Mlt::Profile profile((char*) KdenliveSettings::current_profile().data());
     QPixmap pix(width, height);
@@ -221,29 +295,41 @@ QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) {
         return pix;
     }
     return getFrame(producer, frame, width, height);
-}
+}*/
 
 //static
-QPixmap KThumb::getFrame(Mlt::Producer producer, int framepos, int width, int height) {
+QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height) {
+    if (producer == NULL) {
+        QPixmap p(width, height);
+        p.fill(Qt::red);
+        return p;
+    }
+
+    producer->seek(framepos);
+    Mlt::Frame *frame = producer->get_frame();
+    if (!frame) {
+        kDebug() << "///// BROKEN FRAME";
+        QPixmap p(width, height);
+        p.fill(Qt::red);
+        return p;
+    }
 
-    producer.seek(framepos);
-    Mlt::Frame *frame = producer.get_frame();
     mlt_image_format format = mlt_image_yuv422;
     int frame_width = 0;
     int frame_height = 0;
     frame->set("normalised_height", height);
     frame->set("normalised_width", width);
     QPixmap pix(width, height);
-
     uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
     uint8_t *new_image = (uint8_t *)mlt_pool_alloc(frame_width * (frame_height + 1) * 4);
     mlt_convert_yuv422_to_rgb24a((uint8_t *)data, new_image, frame_width * frame_height);
+
     QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
 
     if (!image.isNull()) {
-        pix = pix.fromImage(image.rgbSwapped());
+        pix = QPixmap::fromImage(image.rgbSwapped());
     } else
-        pix.fill(Qt::black);
+        pix.fill(Qt::red);
 
     mlt_pool_release(new_image);
     delete frame;
@@ -325,10 +411,9 @@ void KThumb::getThumbs(KUrl url, int startframe, int endframe, int width, int he
 }
 */
 void KThumb::stopAudioThumbs() {
-    if (thumbProducer.isRunning()) thumbProducer.stop_me = true;
+    if (audioThumbProducer.isRunning()) audioThumbProducer.stop_me = true;
 }
 
-
 void KThumb::removeAudioThumb() {
     if (m_thumbFile.isEmpty()) return;
     stopAudioThumbs();
@@ -337,8 +422,11 @@ void KThumb::removeAudioThumb() {
 }
 
 void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) {
-
-    if ((thumbProducer.isRunning() && thumbProducer.isWorking()) || channel == 0) {
+    if (channel == 0) {
+        slotAudioThumbOver();
+        return;
+    }
+    if ((audioThumbProducer.isRunning() && audioThumbProducer.isWorking())) {
         return;
     }
 
@@ -354,6 +442,7 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
         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";
@@ -366,21 +455,27 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
             }
         }
         emit audioThumbReady(storeIn);
+        slotAudioThumbOver();
     } else {
-        if (thumbProducer.isRunning()) return;
-        thumbProducer.init(this, m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
-        thumbProducer.start(QThread::LowestPriority);
+        if (audioThumbProducer.isRunning()) return;
+        audioThumbProducer.init(this, m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
+        audioThumbProducer.start(QThread::LowestPriority);
         kDebug() << "STARTING GENERATE THMB FOR: " << m_url << " ................................";
     }
 }
 
-void KThumb::customEvent(QEvent * event) {
-    if (event->type() == 10005) {
-        ProgressEvent* p = (ProgressEvent*) event;
-        m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), p->value());
-    }
+void KThumb::slotAudioThumbProgress(const int progress) {
+    m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), progress);
 }
 
+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);
+}
 
 
 #include "kthumb.moc"