From c9f1d6944258b8081c6d2ce917b361dee04c2b7e Mon Sep 17 00:00:00 2001 From: Till Theato Date: Wed, 14 Sep 2011 18:38:56 +0000 Subject: [PATCH] Disable threads option for rendering Flash. The Flash encoder does not work with more than one thread: http://www.kdenlive.org/mantis/view.php?id=2312 svn path=/trunk/kdenlive/; revision=5915 --- CHANGELOG | 1 + export/profiles.xml | 6 +++--- src/renderwidget.cpp | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4538fa5e..6413f9a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,6 +27,7 @@ HEAD * Allow use of different ffmpeg preset for 1st and 2nd render pass. * Notes widget: context menu now allows to insert clickable timecode to make easy reference to some place in the project. + * Fix rendering to Flash could be broken by setting the number of encoder threads. (http://www.kdenlive.org/mantis/view.php?id=2312) * Fix DVD wizard losing chapters data when switching to menu page. * Fix previewing of affine transitions with transparent png. * Fix timeline corruption when using 'Remove space' tool (transitions could overlap). diff --git a/export/profiles.xml b/export/profiles.xml index c91281b8..ae84a9e4 100644 --- a/export/profiles.xml +++ b/export/profiles.xml @@ -70,9 +70,9 @@ - - + args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=%bitrate+'k' progressive=1 pass=%passes threads=1" /> + + diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 65992b4a..1c365020 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -780,7 +780,9 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const if (!exportAudio) renderArgs.append(" an=1 "); // Set the thread counts - renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads())); + if (!renderArgs.contains("threads=")) { + renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads())); + } renderArgs.append(QString(" real_time=-%1").arg(KdenliveSettings::mltthreads())); // Check if the rendering profile is different from project profile, @@ -1269,6 +1271,8 @@ void RenderWidget::refreshParams() m_view.checkTwoPass->setEnabled(params.contains("passes")); + m_view.encoder_threads->setEnabled(!params.contains("threads=")); + m_view.buttonRender->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); m_view.buttonGenerateScript->setEnabled(m_view.size_list->currentItem()->toolTip().isEmpty()); } -- 2.39.2