#include <qxml.h>
#include <QImage>
#include <QApplication>
+#include <QtConcurrentRun>
void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth)
{
m_producer.seek(z);
Mlt::Frame *mlt_frame = m_producer.get_frame();
if (mlt_frame && mlt_frame->is_valid()) {
- double m_framesPerSecond = mlt_producer_get_fps(m_producer.get_producer()); //mlt_frame->get_double( "fps" );
+ double m_framesPerSecond = mlt_producer_get_fps(m_producer.get_producer());
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;
-
- qint16* m_pcm = static_cast<qint16*>( mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples));
+ qint16* m_pcm = static_cast<qint16*>(mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples));
for (int c = 0; c < m_channels; c++) {
QByteArray m_array;
} else emit audioThumbOver();
}
+
KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) :
QObject(parent),
m_audioThumbProducer(),
m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
connect(&m_audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
connect(&m_audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
-
}
KThumb::~KThumb()
{
+ m_requestedThumbs.clear();
if (m_audioThumbProducer.isRunning()) {
m_audioThumbProducer.stop_me = true;
m_audioThumbProducer.wait();
slotAudioThumbOver();
}
+ m_future.waitForFinished();
}
void KThumb::setProducer(Mlt::Producer *producer)
{
+ m_requestedThumbs.clear();
+ m_future.waitForFinished();
m_producer = producer;
// FIXME: the profile() call leaks an object, but trying to free
// it leads to a double-free in Profile::~Profile()
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;
- }
+ if (m_producer)
+ m_producer->set("resource", url.path().toUtf8().constData());
m_thumbFile = m_clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
}
void KThumb::extractImage(int frame, int frame2)
{
- // kDebug() << "//extract thumb: " << frame << ", " << frame2;
if (!KdenliveSettings::videothumbnails() || m_producer == NULL) return;
+ if (frame != -1 && !m_requestedThumbs.contains(frame)) m_requestedThumbs.append(frame);
+ if (frame2 != -1 && !m_requestedThumbs.contains(frame2)) m_requestedThumbs.append(frame2);
+ if (!m_future.isRunning()) m_future = QtConcurrent::run(this, &KThumb::doGetThumbs);
+}
- const int twidth = (int)(KdenliveSettings::trackheight() * m_dar);
+void KThumb::doGetThumbs()
+{
const int theight = KdenliveSettings::trackheight();
+ const int twidth = FRAME_SIZE;//(int)(theight * m_dar + 0.5);
- if (frame != -1) {
- QPixmap pix = getFrame(m_producer, frame, twidth, theight);
- emit thumbReady(frame, pix);
- }
- if (frame2 != -1) {
- QPixmap pix = getFrame(m_producer, frame2, twidth, theight);
- emit thumbReady(frame2, pix);
+ while (!m_requestedThumbs.isEmpty()) {
+ int frame = m_requestedThumbs.takeFirst();
+ if (frame != -1) {
+ QImage img = getFrame(m_producer, frame, twidth, theight);
+ emit thumbReady(frame, img);
+ }
}
}
QPixmap KThumb::extractImage(int frame, int width, int height)
{
- return getFrame(m_producer, frame, width, height);
+ return QPixmap::fromImage(getFrame(m_producer, frame, width, height));
}
//static
QPixmap KThumb::getImage(KUrl url, int frame, int width, int height)
{
- char *tmp = Render::decodedString(KdenliveSettings::current_profile());
- Mlt::Profile profile(tmp);
- delete[] tmp;
+ Mlt::Profile profile(KdenliveSettings::current_profile().toUtf8().constData());
QPixmap pix(width, height);
if (url.isEmpty()) return pix;
- tmp = Render::decodedString(url.path());
//"<mlt><playlist><producer resource=\"" + url.path() + "\" /></playlist></mlt>");
//Mlt::Producer producer(profile, "xml-string", tmp);
- Mlt::Producer *producer = new Mlt::Producer(profile, tmp);
- delete[] tmp;
+ Mlt::Producer *producer = new Mlt::Producer(profile, url.path().toUtf8().constData());
- pix = getFrame(producer, frame, width, height);
+ pix = QPixmap::fromImage(getFrame(producer, frame, width, height));
delete producer;
return pix;
}
//static
-QPixmap KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
+QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
{
- QPixmap p(width, height);
+ QImage p(width, height, QImage::Format_ARGB32_Premultiplied);
if (producer == NULL) {
p.fill(Qt::red);
return p;
return p;
}
+ /*Mlt::Producer parentProd(producer->parent());
+ Mlt::Service service(parentProd.get_service());
+ mlt_service_lock(service.get_service());*/
+ int ow = width;
+ int oh = height;
mlt_image_format format = mlt_image_rgb24a;
- int frame_width = width;
- int frame_height = height;
- uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
- QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
+ uint8_t *data = frame->get_image(format, ow, oh, 0);
+ QImage image((uchar *)data, ow, oh, QImage::Format_ARGB32_Premultiplied);
+ //mlt_service_unlock(service.get_service());
if (!image.isNull()) {
- p = QPixmap::fromImage(image.rgbSwapped());
+ if (ow > (2 * width)) {
+ // there was a scaling problem, do it manually
+ QImage scaled = image.scaled(width, height);
+ p = scaled.rgbSwapped();
+ } else p = image.rgbSwapped();
} else
p.fill(Qt::red);
{
if (url.isEmpty()) return;
QPixmap image(width, height);
- char *tmp = KRender::decodedString(url.path());
- Mlt::Producer m_producer(tmp);
- delete tmp;
+ Mlt::Producer m_producer(url.path().toUtf8().constData());
image.fill(Qt::black);
if (m_producer.is_blank()) {
{
if (url.isEmpty()) return;
QPixmap image(width, height);
- char *tmp = KRender::decodedString(url.path());
- Mlt::Producer m_producer(tmp);
- delete tmp;
+ Mlt::Producer m_producer(url.path().toUtf8().constData());
image.fill(Qt::black);
if (m_producer.is_blank()) {
if (m_audioThumbProducer.isRunning()) return;
m_audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
m_audioThumbProducer.start(QThread::LowestPriority);
- kDebug() << "STARTING GENERATE THMB FOR: " << m_url << " ................................";
+ // kDebug() << "STARTING GENERATE THMB FOR: " <<m_id<<", URL: "<< m_url << " ................................";
}
}
projects / kdenlive / blobdiff