X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.cpp;h=1975dd833a7a2c579a1b9b2da5680f4db20068d0;hb=d5e2d9e691b22dab741ed689df6d87478ba24c9f;hp=e83672bb0d7656763d4a9b66e46044dd2bbf71b3;hpb=0cbb07741ba0231769020d4370ee56dbd9ae3519;p=kdenlive

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index e83672bb..1975dd83 100644
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -125,6 +125,92 @@ 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);
+
+    }
+    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_producer(NULL), m_dar(1) {
     QCryptographicHash context(QCryptographicHash::Sha1);
@@ -134,7 +220,7 @@ KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char
 }
 
 KThumb::~KThumb() {
-    if (thumbProducer.isRunning()) thumbProducer.exit();
+    if (audioThumbProducer.isRunning()) audioThumbProducer.exit();
 }
 
 void KThumb::setProducer(Mlt::Producer *producer) {
@@ -163,10 +249,12 @@ void KThumb::extractImage(int frame, int frame2) {
         return;
     }
     if (frame != -1) {
+        //videoThumbProducer.getThumb(frame);
         QPixmap pix = getFrame(m_producer, frame, twidth, KdenliveSettings::trackheight());
         emit thumbReady(frame, pix);
     }
     if (frame2 != -1) {
+        //videoThumbProducer.getThumb(frame2);
         QPixmap pix = getFrame(m_producer, frame2, twidth , KdenliveSettings::trackheight());
         emit thumbReady(frame2, pix);
     }
@@ -223,18 +311,18 @@ QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) {
 //static
 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;
+        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;
+        QPixmap p(width, height);
+        p.fill(Qt::red);
+        return p;
     }
     mlt_image_format format = mlt_image_yuv422;
     int frame_width = 0;
@@ -333,7 +421,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;
 }
 
 
@@ -346,7 +434,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;
     }
 
@@ -375,16 +463,16 @@ 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;
+        ProgressEvent* p = static_cast <ProgressEvent*>(event);
         m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), p->value());
     }
 }