#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)
{
int last_val = 0;
int val = 0;
kDebug() << "for " << m_frame << " " << m_frameLength << " " << m_producer.is_valid();
- for (int z = (int) m_frame;z < (int)(m_frame + m_frameLength) && m_producer.is_valid();z++) {
+ for (int z = (int) m_frame; z < (int)(m_frame + m_frameLength) && m_producer.is_valid(); z++) {
if (stop_me) break;
val = (int)((z - m_frame) / (m_frame + m_frameLength) * 100.0);
if (last_val != val && val > 1) {
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 = mlt_frame->get_audio(m_audioFormat, m_frequency, m_channels, m_samples);
-
- for (int c = 0;c < m_channels;c++) {
+ for (int c = 0; c < m_channels; c++) {
QByteArray m_array;
m_array.resize(m_arrayWidth);
for (int i = 0; i < m_array.size(); i++) {
} else emit audioThumbOver();
}
+
KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) :
QObject(parent),
- audioThumbProducer(),
+ m_audioThumbProducer(),
m_url(url),
m_thumbFile(),
m_dar(1),
m_producer(NULL),
m_clipManager(clipManager),
- m_id(id),
- m_mainFrame(-1)
+ m_id(id)
{
m_thumbFile = clipManager->projectFolder() + "/thumbs/" + hash + ".thumb";
- connect(&audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
- connect(&audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
-
+ connect(&m_audioThumbProducer, SIGNAL(audioThumbProgress(const int)), this, SLOT(slotAudioThumbProgress(const int)));
+ connect(&m_audioThumbProducer, SIGNAL(audioThumbOver()), this, SLOT(slotAudioThumbOver()));
}
KThumb::~KThumb()
{
- if (audioThumbProducer.isRunning()) {
- audioThumbProducer.stop_me = true;
- audioThumbProducer.wait();
+ 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::extractImage(int frame, int frame2)
{
- if (m_url.isEmpty() || !KdenliveSettings::videothumbnails() || m_producer == NULL) return;
+ 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);
- mlt_image_format format = mlt_image_yuv422;
- if (m_producer->is_blank()) {
- QPixmap pix(twidth, theight);
- pix.fill(Qt::black);
- emit thumbReady(frame, pix);
- return;
- }
- Mlt::Frame *mltFrame;
- if (frame != -1) {
- //videoThumbProducer.getThumb(frame);
- m_producer->seek(frame);
- mltFrame = m_producer->get_frame();
- if (frame2 != -1) m_producer->seek(frame2);
- if (!mltFrame) {
- kDebug() << "///// BROKEN FRAME";
- QPixmap p(twidth, theight);
- p.fill(Qt::red);
- emit thumbReady(frame, p);
- return;
- } else {
- int frame_width = 0;
- int frame_height = 0;
- mltFrame->set("normalised_height", theight);
- mltFrame->set("normalised_width", twidth);
- QPixmap pix(twidth, theight);
- uint8_t *data = mltFrame->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 = QPixmap::fromImage(image.rgbSwapped());
- } else
- pix.fill(Qt::red);
-
- mlt_pool_release(new_image);
- delete mltFrame;
- emit thumbReady(frame, pix);
- }
- } else if (frame2 != -1) m_producer->seek(frame2);
- if (frame2 != -1) {
- mltFrame = m_producer->get_frame();
- if (!mltFrame) {
- kDebug() << "///// BROKEN FRAME";
- QPixmap p(twidth, theight);
- p.fill(Qt::red);
- emit thumbReady(frame, p);
- return;
- } else {
- int frame_width = 0;
- int frame_height = 0;
- mltFrame->set("normalised_height", theight);
- mltFrame->set("normalised_width", twidth);
- QPixmap pix(twidth, theight);
- uint8_t *data = mltFrame->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 = QPixmap::fromImage(image.rgbSwapped());
- } else
- pix.fill(Qt::red);
-
- mlt_pool_release(new_image);
- delete mltFrame;
- 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)
{
- Mlt::Profile profile((char*) KdenliveSettings::current_profile().data());
+ char *tmp = Render::decodedString(KdenliveSettings::current_profile());
+ Mlt::Profile profile(tmp);
+ delete[] tmp;
QPixmap pix(width, height);
if (url.isEmpty()) return pix;
- char *tmp = Render::decodedString(url.path());
- //"<westley><playlist><producer resource=\"" + url.path() + "\" /></playlist></westley>");
- //Mlt::Producer producer(profile, "westley-xml", tmp);
+ 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;
- if (producer->is_blank()) {
- pix.fill(Qt::black);
- delete producer;
- return pix;
- }
- pix = getFrame(producer, frame, width, height);
+ pix = QPixmap::fromImage(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);
- QDomDocument doc;
- QDomElement westley = doc.createElement("westley");
- QDomElement play = doc.createElement("playlist");
- doc.appendChild(westley);
- westley.appendChild(play);
- play.appendChild(doc.importNode(xml, true));
- char *tmp = Render::decodedString(doc.toString());
- 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);
-}*/
//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)
{
+ QImage p(width, height, QImage::Format_ARGB32);
if (producer == NULL) {
- QPixmap p(width, height);
p.fill(Qt::red);
return p;
}
+ if (producer->is_blank()) {
+ p.fill(Qt::black);
+ 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_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);
+ /*Mlt::Producer parentProd(producer->parent());
+ Mlt::Service service(parentProd.get_service());
+ mlt_service_lock(service.get_service());*/
- QImage image((uchar *)new_image, frame_width, frame_height, QImage::Format_ARGB32);
+ mlt_image_format format = mlt_image_rgb24a;
+ uint8_t *data = frame->get_image(format, width, height, 0);
+ QImage image((uchar *)data, width, height, QImage::Format_ARGB32);
+ //mlt_service_unlock(service.get_service());
if (!image.isNull()) {
- pix = QPixmap::fromImage(image.rgbSwapped());
+ p = image.rgbSwapped();
} else
- pix.fill(Qt::red);
+ p.fill(Qt::red);
- mlt_pool_release(new_image);
delete frame;
- return pix;
+ return p;
}
/*
void KThumb::getImage(KUrl url, int frame, int width, int height)
*/
void KThumb::stopAudioThumbs()
{
- if (audioThumbProducer.isRunning()) {
- audioThumbProducer.stop_me = true;
+ if (m_audioThumbProducer.isRunning()) {
+ m_audioThumbProducer.stop_me = true;
slotAudioThumbOver();
}
}
slotAudioThumbOver();
return;
}
- if ((audioThumbProducer.isRunning() && audioThumbProducer.isWorking())) {
+ if ((m_audioThumbProducer.isRunning() && m_audioThumbProducer.isWorking())) {
return;
}
return;
}
kDebug() << "reading audio thumbs from file";
- for (int z = (int) frame;z < (int)(frame + frameLength);z++) {
- for (int c = 0;c < m_channels;c++) {
+ for (int z = (int) frame; z < (int)(frame + frameLength); z++) {
+ for (int c = 0; c < m_channels; c++) {
QByteArray m_array(arrayWidth, '\x00');
for (int i = 0; i < arrayWidth; i++)
m_array[i] = channelarray[z*arrayWidth*m_channels + c*arrayWidth + i];
emit audioThumbReady(storeIn);
slotAudioThumbOver();
} else {
- if (audioThumbProducer.isRunning()) return;
- audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
- audioThumbProducer.start(QThread::LowestPriority);
- kDebug() << "STARTING GENERATE THMB FOR: " << m_url << " ................................";
+ 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_id<<", URL: "<< m_url << " ................................";
}
}
projects / kdenlive / blobdiff