#include <QApplication>
#include <QtConcurrentRun>
-void MyThread::init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth)
-{
- stop_me = false;
- m_isWorking = false;
- f.setFileName(target);
- m_url = url;
- m_frame = frame;
- m_frameLength = frameLength;
- m_frequency = frequency;
- m_channels = channels;
- m_arrayWidth = arrayWidth;
-}
-
-bool MyThread::isWorking()
-{
- return m_isWorking;
-}
-
-void MyThread::run()
-{
- if (!f.open(QIODevice::WriteOnly)) {
- kDebug() << "++++++++ ERROR WRITING TO FILE: " << f.fileName() << endl;
- kDebug() << "++++++++ DISABLING AUDIO THUMBS" << endl;
- KdenliveSettings::setAudiothumbnails(false);
- return;
- }
- m_isWorking = true;
- Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().data());
- Mlt::Producer m_producer(prof, m_url.path().toUtf8().data());
-
-
- if (KdenliveSettings::normaliseaudiothumbs()) {
- Mlt::Filter m_convert(prof, "volume");
- m_convert.set("gain", "normalise");
- m_producer.attach(m_convert);
- }
-
- 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++) {
- if (stop_me) break;
- val = (int)((z - m_frame) / (m_frame + m_frameLength) * 100.0);
- if (last_val != val && val > 1) {
- emit audioThumbProgress(val);
- last_val = val;
- }
- 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());
- 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));
-
- 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++) {
- m_array[i] = ((*(m_pcm + c + i * m_samples / m_array.size())) >> 9) + 127 / 2 ;
- }
- f.write(m_array);
-
- }
- } else {
- f.write(QByteArray(m_arrayWidth, '\x00'));
- }
- delete mlt_frame;
- }
- //kDebug() << "done";
- f.close();
- m_isWorking = false;
- if (stop_me) {
- f.remove();
- } 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_url(url),
- m_thumbFile(),
- m_dar(1),
- m_producer(NULL),
- m_clipManager(clipManager),
- m_id(id)
+ QObject(parent),
+ m_audioThumbProducer(),
+ m_url(url),
+ m_thumbFile(),
+ m_dar(1),
+ m_producer(NULL),
+ m_clipManager(clipManager),
+ m_id(id),
+ m_stopAudioThumbs(false)
{
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();
+ m_stopAudioThumbs = true;
+ m_audioThumbProducer.waitForFinished();
slotAudioThumbOver();
}
m_future.waitForFinished();
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";
}
//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 = QPixmap::fromImage(getFrame(producer, frame, width, height));
delete producer;
//static
QImage KThumb::getFrame(Mlt::Producer *producer, int framepos, int width, int height)
{
- QImage p(width, height, QImage::Format_ARGB32);
+ QImage p(width, height, QImage::Format_ARGB32_Premultiplied);
if (producer == NULL) {
p.fill(Qt::red);
return p;
int oh = height;
mlt_image_format format = mlt_image_rgb24a;
uint8_t *data = frame->get_image(format, ow, oh, 0);
- QImage image((uchar *)data, ow, oh, QImage::Format_ARGB32);
+ QImage image((uchar *)data, ow, oh, QImage::Format_ARGB32_Premultiplied);
//mlt_service_unlock(service.get_service());
if (!image.isNull()) {
{
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()) {
void KThumb::stopAudioThumbs()
{
if (m_audioThumbProducer.isRunning()) {
- m_audioThumbProducer.stop_me = true;
+ m_stopAudioThumbs = true;
+ m_audioThumbProducer.waitForFinished();
slotAudioThumbOver();
}
}
slotAudioThumbOver();
return;
}
- if ((m_audioThumbProducer.isRunning() && m_audioThumbProducer.isWorking())) {
+ if (m_audioThumbProducer.isRunning()) {
return;
}
QMap <int, QMap <int, QByteArray> > storeIn;
//FIXME: Hardcoded!!!
- int m_frequency = 48000;
- int m_channels = channel;
+ m_frequency = 48000;
+ m_channels = channel;
QFile f(m_thumbFile);
if (f.open(QIODevice::ReadOnly)) {
slotAudioThumbOver();
return;
}
+
kDebug() << "reading audio thumbs from file";
+
+ int h1 = arrayWidth * m_channels;
+ int h2 = (int) frame * h1;
+ int h3;
for (int z = (int) frame; z < (int)(frame + frameLength); z++) {
+ h2 += h1;
+ h3 = 0;
for (int c = 0; c < m_channels; c++) {
+ h3 += arrayWidth;
QByteArray m_array(arrayWidth, '\x00');
for (int i = 0; i < arrayWidth; i++)
- m_array[i] = channelarray[z*arrayWidth*m_channels + c*arrayWidth + i];
+ m_array[i] = channelarray[h2 + h3 + i];
storeIn[z][c] = m_array;
}
}
slotAudioThumbOver();
} else {
if (m_audioThumbProducer.isRunning()) return;
- m_audioThumbProducer.init(m_url, m_thumbFile, frame, frameLength, m_frequency, m_channels, arrayWidth);
- m_audioThumbProducer.start(QThread::LowestPriority);
+ m_audioThumbFile.setFileName(m_thumbFile);
+ m_frame = frame;
+ m_frameLength = frameLength;
+ m_arrayWidth = arrayWidth;
+ m_audioThumbProducer = QtConcurrent::run(this, &KThumb::slotCreateAudioThumbs);
+ /*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 << " ................................";
}
}
-void KThumb::slotAudioThumbProgress(const int progress)
+void KThumb::slotCreateAudioThumbs()
{
- m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), progress);
+ if (!m_audioThumbFile.open(QIODevice::WriteOnly)) {
+ kDebug() << "++++++++ ERROR WRITING TO FILE: " << m_audioThumbFile.fileName();
+ kDebug() << "++++++++ DISABLING AUDIO THUMBS";
+ KdenliveSettings::setAudiothumbnails(false);
+ return;
+ }
+ Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().data());
+ Mlt::Producer m_producer(prof, m_url.path().toUtf8().data());
+
+ if (KdenliveSettings::normaliseaudiothumbs()) {
+ Mlt::Filter m_convert(prof, "volume");
+ m_convert.set("gain", "normalise");
+ m_producer.attach(m_convert);
+ }
+
+ 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++) {
+ if (m_stopAudioThumbs) break;
+ val = (int)((z - m_frame) / (m_frame + m_frameLength) * 100.0);
+ if (last_val != val && val > 1) {
+ m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), val);
+ last_val = val;
+ }
+ 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());
+ 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));
+
+ 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++) {
+ m_array[i] = ((*(m_pcm + c + i * m_samples / m_array.size())) >> 9) + 127 / 2 ;
+ }
+ m_audioThumbFile.write(m_array);
+
+ }
+ } else {
+ m_audioThumbFile.write(QByteArray(m_arrayWidth, '\x00'));
+ }
+ delete mlt_frame;
+ }
+ m_audioThumbFile.close();
+ if (m_stopAudioThumbs) {
+ m_audioThumbFile.remove();
+ } else {
+ slotAudioThumbOver();
+ }
}
void KThumb::slotAudioThumbOver()
projects / kdenlive / blobdiff