Fix timeline video thumbnail aspect ratio

[kdenlive] / src / kthumb.cpp

diff --git a/src/kthumb.cpp b/src/kthumb.cpp
index 50eb0abefc02f15b7b76dab2576a294301e11b0b..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,23 +160,24 @@ 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() * 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());
+        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);
     }
 }
@@ -189,7 +192,6 @@ 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);
@@ -221,9 +223,8 @@ 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 (framepos > 0)
-        producer.seek(framepos);
 
+    producer.seek(framepos);
     Mlt::Frame *frame = producer.get_frame();
     mlt_image_format format = mlt_image_yuv422;
     int frame_width = 0;
@@ -244,7 +245,6 @@ QPixmap KThumb::getFrame(Mlt::Producer producer, int framepos, int width, int he
 
     mlt_pool_release(new_image);
     delete frame;
-
     return pix;
 }
 /*