Fix timeline video thumbnail aspect ratio

[kdenlive] / src / kthumb.cpp

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 948affe7aad8cb3a3bbffd601f094ee060d42caa..b43098b71f9e4ab3f1bcd86ba96dc966379484a8 100644 (file)
--- a/src/kthumb.cpp
+++ b/src/kthumb.cpp
@@ -132,9 +132,7 @@ void MyThread::run() {
 #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_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,10 +140,14 @@ KThumb::KThumb(ClipManager *clipManager, KUrl url, QObject * parent, const char
 }
 
 KThumb::~KThumb() {
-    if (m_profile) delete m_profile;
     if (thumbProducer.isRunning()) thumbProducer.exit();
 }
 
+void KThumb::setProducer(Mlt::Producer *producer) {
+    m_producer = producer;
+    m_dar = producer->profile()->dar();
+}
+
 void KThumb::updateClipUrl(KUrl url) {
     m_url = url;
 }
@@ -158,26 +160,26 @@ 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>");
+    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;
+    delete[] tmp;*/
 
-    int twidth = (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio());
-    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());
+        QPixmap pix = getFrame(*m_producer, frame, twidth, KdenliveSettings::trackheight());
         emit thumbReady(frame, pix);
     }
     if (frame2 != -1) {
-        QPixmap pix = getFrame(&producer, frame2, twidth , KdenliveSettings::trackheight());
+        QPixmap pix = getFrame(*m_producer, frame2, twidth , KdenliveSettings::trackheight());
         emit thumbReady(frame2, pix);
     }
-
 }
 
 //static
@@ -190,13 +192,12 @@ QPixmap KThumb::getImage(KUrl url, int frame, int width, int height) {
     Mlt::Producer producer(profile, "westley-xml", tmp);
     delete[] tmp;
 
-
     if (producer.is_blank()) {
 
         pix.fill(Qt::black);
         return pix;
     }
-    return getFrame(&producer, frame, width, height);
+    return getFrame(producer, frame, width, height);
 }
 
 //static
@@ -217,31 +218,33 @@ QPixmap KThumb::getImage(QDomElement xml, int frame, int width, int height) {
         pix.fill(Qt::black);
         return pix;
     }
-    return getFrame(&producer, frame, width, height);
+    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);
-    Mlt::Frame *frame = producer->get_frame();
+QPixmap KThumb::getFrame(Mlt::Producer producer, int framepos, int width, int height) {
 
+    producer.seek(framepos);
+    Mlt::Frame *frame = producer.get_frame();
     mlt_image_format format = mlt_image_yuv422;
-    uint8_t* data;
     int frame_width = 0;
     int frame_height = 0;
-    mlt_frame_get_image(frame->get_frame(), &data, &format, &frame_width, &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()) {
-        QImage scale = image.scaled(width, height, Qt::KeepAspectRatio, Qt::SmoothTransformation).rgbSwapped();
-        pix = pix.fromImage(scale);
-    } else pix.fill(Qt::black);
-       mlt_pool_release(new_image);
-    if (frame) delete frame;
+        pix = pix.fromImage(image.rgbSwapped());
+    } else
+        pix.fill(Qt::black);
+
+    mlt_pool_release(new_image);
+    delete frame;
     return pix;
 }
 /*
@@ -372,7 +375,7 @@ void KThumb::getAudioThumbs(int channel, double frame, double frameLength, int a
 void KThumb::customEvent(QEvent * event) {
     if (event->type() == 10005) {
         ProgressEvent* p = (ProgressEvent*) event;
-        m_clipManager->setThumbsProgress(m_url.path(), p->value());
+        m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), p->value());
     }
 }