Fix some avformat producer concurrency crashes

[kdenlive] / src / cliptranscode.cpp

diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp
index 1d9e29fa601a4a8ce0f7e3e43e9e35f0534c8888..8dbf6df4430c436500464390dbf4ca5c24ed450c 100644 (file)
--- a/src/cliptranscode.cpp
+++ b/src/cliptranscode.cpp
@@ -27,21 +27,23 @@
 
 
 ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, const QString &description, QWidget * parent) :
-        QDialog(parent), m_urls(urls)
+        QDialog(parent), m_urls(urls), m_duration(0)
 {
     setFont(KGlobalSettings::toolBarFont());
     setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
+    log_text->setHidden(true);
     setWindowTitle(i18n("Transcode Clip"));
     auto_add->setText(i18np("Add clip to project", "Add clips to project", m_urls.count()));
-    dest_url->fileDialog()->setOperationMode(KFileDialog::Saving);
 
     if (m_urls.count() == 1) {
         QString fileName = m_urls.at(0).path(); //.section('.', 0, -1);
         QString newFile = params.section(' ', -1).replace("%1", fileName);
         KUrl dest(newFile);
         source_url->setUrl(m_urls.at(0));
+        dest_url->setMode(KFile::File);
         dest_url->setUrl(dest);
+        dest_url->fileDialog()->setOperationMode(KFileDialog::Saving);
         urls_list->setHidden(true);
         connect(source_url, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateParams()));
     } else {
@@ -50,6 +52,7 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, const QStri
         label_dest->setText(i18n("Destination folder"));
         dest_url->setMode(KFile::Directory);
         dest_url->setUrl(KUrl(m_urls.at(0).directory()));
+        dest_url->fileDialog()->setOperationMode(KFileDialog::Saving);
         for (int i = 0; i < m_urls.count(); i++)
             urls_list->addItem(m_urls.at(i).path());
     }
@@ -71,7 +74,7 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, const QStri
             i.next();
             QStringList data = i.value().split(";", QString::SkipEmptyParts);
             profile_list->addItem(i.key(), data.at(0));
-            profile_list->setItemData(profile_list->count() - 1, data.at(1), Qt::UserRole + 1);
+            if (data.count() > 1) profile_list->setItemData(profile_list->count() - 1, data.at(1), Qt::UserRole + 1);
         }
         connect(profile_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateParams(int)));
         slotUpdateParams(0);
@@ -83,7 +86,7 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, const QStri
     connect(&m_transcodeProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowTranscodeInfo()));
     connect(&m_transcodeProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotTranscodeFinished(int, QProcess::ExitStatus)));
 
-    //adjustSize();
+    adjustSize();
 }
 
 ClipTranscode::~ClipTranscode()
@@ -98,6 +101,7 @@ void ClipTranscode::slotStartTransCode()
     if (m_transcodeProcess.state() != QProcess::NotRunning) {
         return;
     }
+    m_duration = 0;
     QStringList parameters;
     QString destination;
     QString params = ffmpeg_params->toPlainText().simplified();
@@ -134,6 +138,30 @@ void ClipTranscode::slotStartTransCode()
 void ClipTranscode::slotShowTranscodeInfo()
 {
     QString log = QString(m_transcodeProcess.readAll());
+    int progress;
+    if (m_duration == 0) {
+        if (log.contains("Duration:")) {
+            QString data = log.section("Duration:", 1, 1).section(',', 0, 0).simplified();
+            QStringList numbers = data.split(':');
+            m_duration = numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble();
+            log_text->setHidden(true);
+            job_progress->setHidden(false);
+        }
+        else {
+            log_text->setHidden(false);
+            job_progress->setHidden(true);
+        }
+    }
+    else if (log.contains("time=")) {
+        QString time = log.section("time=", 1, 1).simplified().section(' ', 0, 0);
+        if (time.contains(':')) {
+            QStringList numbers = time.split(':');
+            progress = numbers.at(0).toInt() * 3600 + numbers.at(1).toInt() * 60 + numbers.at(2).toDouble();
+        }
+        else progress = (int) time.toDouble();
+        kDebug()<<"// PROGRESS: "<<progress<<", "<<m_duration;
+        job_progress->setValue((int) (100.0 * progress / m_duration));
+    }
     //kDebug() << "//LOG: " << log;
     log_text->setPlainText(log);
 }
@@ -142,9 +170,10 @@ void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exi
 {
     buttonBox->button(QDialogButtonBox::Abort)->setText(i18n("Close"));
     button_start->setEnabled(true);
+    m_duration = 0;
 
     if (exitCode == 0 && exitStatus == QProcess::NormalExit) {
-        log_text->setHtml(log_text->toPlainText() + "<br><b>" + i18n("Transcoding finished."));
+        log_text->setHtml(log_text->toPlainText() + "<br /><b>" + i18n("Transcoding finished."));
         if (auto_add->isChecked()) {
             KUrl url;
             if (urls_list->count() > 0) {
@@ -160,7 +189,7 @@ void ClipTranscode::slotTranscodeFinished(int exitCode, QProcess::ExitStatus exi
             return;
         } else if (auto_close->isChecked()) accept();
     } else {
-        log_text->setHtml(log_text->toPlainText() + "<br><b>" + i18n("Transcoding FAILED!"));
+        log_text->setHtml(log_text->toPlainText() + "<br /><b>" + i18n("Transcoding FAILED!"));
     }
 
     m_transcodeProcess.close();