]> git.sesse.net Git - kdenlive/blobdiff - src/kthumb.cpp
minor fixes
[kdenlive] / src / kthumb.cpp
index 88ab7b432d2bd460a3cbaf2671eb400fb33bcb40..57aaf4a84a2ef1cf4b8c1590a45077bc290fe92c 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include <qxml.h>
+#include <QImage>
+#include <QApplication>
+#include <QCryptographicHash>
+
 #include <kio/netaccess.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include <mlt++/Mlt.h>
 
-#include <qxml.h>
-#include <qimage.h>
-
-#include <QThread>
-#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;
     m_parent = parent;
@@ -126,15 +125,94 @@ void MyThread::run() {
 
 }
 
+void ThumbThread::init(QObject *parent, Mlt::Producer *prod, int width, int height) {
+    stop_me = false;
+    m_parent = parent;
+    m_isWorking = false;
+    m_prod = prod;
+    m_width = width;
+    m_height = height;
+    m_frame1 = -1;
+    m_frame2 = -1;
+}
+
+bool ThumbThread::isWorking() {
+    return m_isWorking;
+}
+
+void ThumbThread::setThumbFrames(Mlt::Producer *prod, int frame1, int frame2) {
+    if (!m_prod) m_prod = prod;
+    m_frame1 = frame1;
+    m_frame2 = frame2;
+}
+
+void ThumbThread::run() {
+    if (m_frame1 != -1 && m_prod) {
+        //mutex.lock();
+        m_prod->seek(m_frame1);
+        Mlt::Frame *avframe = m_prod->get_frame();
+        //mutex.unlock();
+        if (!avframe) {
+            kDebug() << "///// BROKEN FRAME";
+        } else {
+            mlt_image_format format = mlt_image_yuv422;
+            int frame_width = m_width;
+            int frame_height = m_height;
+            avframe->set("normalised_height", m_height);
+            avframe->set("normalised_width", m_width);
+            uint8_t *data = avframe->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()) {
+                emit gotStartThumb(image.rgbSwapped());
+                //QApplication::postEvent(m_parent, new ThumbEvent(m_frame1, image.rgbSwapped(), (QEvent::Type)10006));
+                //pix = QPixmap::fromImage(image.rgbSwapped());
+            } /*else
+  pix.fill(Qt::red);*/
+            mlt_pool_release(new_image);
+            delete avframe;
+        }
+        //pix.fill(Qt::red);
 
-#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
+    }
+    if (m_frame2 != -1 && m_prod) {
+        //mutex.lock();
+        m_prod->seek(m_frame2);
+        Mlt::Frame *avframe = m_prod->get_frame();
+        //mutex.unlock();
+        if (!avframe) {
+            kDebug() << "///// BROKEN FRAME";
+        } else {
+            mlt_image_format format = mlt_image_yuv422;
+            int frame_width = 0;
+            int frame_height = 0;
+            avframe->set("normalised_height", m_height);
+            avframe->set("normalised_width", m_width);
+            uint8_t *data = avframe->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()) {
+                emit gotEndThumb(image.rgbSwapped());
+                //QApplication::postEvent(m_parent, new ThumbEvent(m_frame2, image.rgbSwapped(), (QEvent::Type)10006));
+                //pix = QPixmap::fromImage(image.rgbSwapped());
+            } /*else
+  pix.fill(Qt::red);*/
+            mlt_pool_release(new_image);
+            delete avframe;
+        }
+        //pix.fill(Qt::red);
+        //QApplication::postEvent(m_parent, new ThumbEvent(m_frame2, pix, (QEvent::Type)10006));
+    }
+}
 
-KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url) {
 
-    m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
+KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char *name): QObject(parent), m_clipManager(clipManager), m_url(url), m_producer(NULL), m_dar(1) {
     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";
@@ -142,8 +220,12 @@ KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char
 }
 
 KThumb::~KThumb() {
-    if (m_profile) delete m_profile;
-    if (thumbProducer.isRunning()) thumbProducer.exit();
+    if (audioThumbProducer.isRunning()) audioThumbProducer.exit();
+}
+
+void KThumb::setProducer(Mlt::Producer *producer) {
+    m_producer = producer;
+    m_dar = producer->profile()->dar();
 }
 
 void KThumb::updateClipUrl(KUrl url) {
@@ -157,48 +239,55 @@ QPixmap KThumb::getImage(KUrl url, int width, int height) {
 }
 
 void KThumb::extractImage(int frame, int frame2) {
-    if (m_url.isEmpty()) 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());
-    if (producer.is_blank()) {
+    int twidth = (int)(KdenliveSettings::trackheight() * m_dar);
+    if (m_producer->is_blank()) {
         QPixmap pix(twidth, KdenliveSettings::trackheight());
         pix.fill(Qt::black);
         emit thumbReady(frame, pix);
         return;
     }
     if (frame != -1) {
-        QPixmap pix = getFrame(producer, frame, twidth, KdenliveSettings::trackheight());
+        //videoThumbProducer.getThumb(frame);
+        QPixmap pix = getFrame(m_producer, frame, twidth, KdenliveSettings::trackheight());
         emit thumbReady(frame, pix);
     }
     if (frame2 != -1) {
-        QPixmap pix = getFrame(producer, frame2, twidth , KdenliveSettings::trackheight());
+        //videoThumbProducer.getThumb(frame2);
+        QPixmap pix = getFrame(m_producer, frame2, twidth , KdenliveSettings::trackheight());
         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);
@@ -217,34 +306,44 @@ 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) {
-    if (framepos > 0)
-        producer.seek(framepos);
+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;
+    }
 
-    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;
-
     return pix;
 }
 /*
@@ -323,7 +422,7 @@ 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;
 }
 
 
@@ -336,7 +435,7 @@ void KThumb::removeAudioThumb() {
 
 void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth) {
 
-    if ((thumbProducer.isRunning() && thumbProducer.isWorking()) || channel == 0) {
+    if ((audioThumbProducer.isRunning() && audioThumbProducer.isWorking()) || channel == 0) {
         return;
     }
 
@@ -365,17 +464,17 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
         }
         emit audioThumbReady(storeIn);
     } 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(m_url.path(), p->value());
+        ProgressEvent* p = static_cast <ProgressEvent*>(event);
+        m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), p->value());
     }
 }