From: <j-...@us...> - 2010-11-28 22:53:22
|
Revision: 5124 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5124&view=rev Author: j-b-m Date: 2010-11-28 22:53:15 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Use QtConcurrent instead of custom thread to create audio thumbs, in an attempt to fix startup crash Modified Paths: -------------- trunk/kdenlive/src/kthumb.cpp trunk/kdenlive/src/kthumb.h Modified: trunk/kdenlive/src/kthumb.cpp =================================================================== --- trunk/kdenlive/src/kthumb.cpp 2010-11-27 22:24:23 UTC (rev 5123) +++ trunk/kdenlive/src/kthumb.cpp 2010-11-28 22:53:15 UTC (rev 5124) @@ -118,26 +118,27 @@ 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())); + /*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(); @@ -345,7 +346,8 @@ void KThumb::stopAudioThumbs() { if (m_audioThumbProducer.isRunning()) { - m_audioThumbProducer.stop_me = true; + m_stopAudioThumbs = true; + m_audioThumbProducer.waitForFinished(); slotAudioThumbOver(); } } @@ -364,14 +366,14 @@ 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)) { @@ -404,12 +406,74 @@ 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::slotCreateAudioThumbs() +{ + 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) { + slotAudioThumbProgress(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::slotAudioThumbProgress(const int progress) { m_clipManager->setThumbsProgress(i18n("Creating thumbnail for %1", m_url.fileName()), progress); Modified: trunk/kdenlive/src/kthumb.h =================================================================== --- trunk/kdenlive/src/kthumb.h 2010-11-27 22:24:23 UTC (rev 5123) +++ trunk/kdenlive/src/kthumb.h 2010-11-28 22:53:15 UTC (rev 5124) @@ -106,9 +106,10 @@ private slots: void slotAudioThumbProgress(const int progress); void slotAudioThumbOver(); - + void slotCreateAudioThumbs(); private: - MyThread m_audioThumbProducer; + //MyThread m_audioThumbProducer; + QFuture<void> m_audioThumbProducer; KUrl m_url; QString m_thumbFile; double m_dar; @@ -117,6 +118,13 @@ QString m_id; QList <int> m_requestedThumbs; QFuture<void> m_future; + QFile m_audioThumbFile; + bool m_stopAudioThumbs; + double m_frame; + double m_frameLength; + int m_frequency; + int m_channels; + int m_arrayWidth; void doGetThumbs(); signals: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |