From: Dan Dennedy <dan@dennedy.org>
Date: Fri, 18 Feb 2011 07:01:54 +0000 (+0000)
Subject: Add mlt and encoder threads to render dialog.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3577376c5e5b6cc533af0edc9d4f03d0b3770f9e;p=kdenlive

Add mlt and encoder threads to render dialog.

svn path=/trunk/kdenlive/; revision=5423
---

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index 7b0d5117..18b97b63 100644
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -43,6 +43,7 @@
 #include <QProcess>
 #include <QDBusConnectionInterface>
 #include <QDBusInterface>
+#include <QThread>
 
 const int GroupRole = Qt::UserRole;
 const int ExtensionRole = GroupRole + 1;
@@ -89,6 +90,10 @@ RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidg
     
     m_view.proxy_render->setHidden(!enableProxy);
 
+	m_view.encoder_threads->setMaximum(QThread::idealThreadCount());
+	m_view.encoder_threads->setValue(KdenliveSettings::encodethreads());
+	connect(m_view.encoder_threads, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateEncodeThreads(int)));
+	
     m_view.rescale_keep->setChecked(KdenliveSettings::rescalekeepratio());
     connect(m_view.rescale_width, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleWidth(int)));
     connect(m_view.rescale_height, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateRescaleHeight(int)));
@@ -755,6 +760,10 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
     // disable audio if requested
     if (!exportAudio) renderArgs.append(" an=1 ");
 
+	// Set the thread counts
+	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,
     // in which case we need to use the producer_comsumer from MLT
     QString std = renderArgs;
@@ -780,7 +789,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
             break;
         }
     }
-
+	
     if (resizeProfile)
         render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath);
     else
@@ -1859,6 +1868,11 @@ void RenderWidget::missingClips(bool hasMissing)
     } else m_view.errorBox->setHidden(true);
 }
 
+void RenderWidget::slotUpdateEncodeThreads(int val)
+{
+	KdenliveSettings::setEncodethreads(val);
+}
+
 void RenderWidget::slotUpdateRescaleWidth(int val)
 {
     KdenliveSettings::setDefaultrescalewidth(val);
diff --git a/src/renderwidget.h b/src/renderwidget.h
index 708d39a6..11e9e08e 100644
--- a/src/renderwidget.h
+++ b/src/renderwidget.h
@@ -164,6 +164,7 @@ private slots:
     void slotPlayRendering(QTreeWidgetItem *item, int);
     void slotStartCurrentJob();
     void slotCopyToFavorites();
+    void slotUpdateEncodeThreads(int);
     void slotUpdateRescaleHeight(int);
     void slotUpdateRescaleWidth(int);
     void slotSwitchAspectRatio();
diff --git a/src/widgets/renderwidget_ui.ui b/src/widgets/renderwidget_ui.ui
index be71963d..b47f26cd 100644
--- a/src/widgets/renderwidget_ui.ui
+++ b/src/widgets/renderwidget_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
-    <height>575</height>
+    <width>387</width>
+    <height>652</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -198,7 +198,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="10">
+       <item row="6" column="0" colspan="10">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QCheckBox" name="rescale">
@@ -222,13 +222,6 @@
             <property name="margin">
              <number>0</number>
             </property>
-            <item row="0" column="0">
-             <widget class="KIntNumInput" name="rescale_width">
-              <property name="minimum">
-               <number>0</number>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="1">
              <widget class="QLabel" name="label_8">
               <property name="text">
@@ -266,47 +259,54 @@
               </property>
              </spacer>
             </item>
+            <item row="0" column="0">
+             <widget class="KIntNumInput" name="rescale_width">
+              <property name="minimum">
+               <number>0</number>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
         </layout>
        </item>
-       <item row="6" column="0" colspan="10">
+       <item row="7" column="0" colspan="10">
         <widget class="QCheckBox" name="open_dvd">
          <property name="text">
           <string>Open Dvd wizard after rendering</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="10">
+       <item row="8" column="0" colspan="10">
         <widget class="QCheckBox" name="create_chapter">
          <property name="text">
           <string>Create chapter file based on guides</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="10">
+       <item row="9" column="0" colspan="10">
         <widget class="QCheckBox" name="open_browser">
          <property name="text">
           <string>Open browser window after export</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="4">
+       <item row="10" column="0" colspan="4">
         <widget class="QCheckBox" name="play_after">
          <property name="text">
           <string>Play after render</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="4" colspan="6">
+       <item row="10" column="4" colspan="6">
         <widget class="QCheckBox" name="tc_overlay">
          <property name="text">
           <string>Timecode overlay</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="0" colspan="10">
+       <item row="11" column="0" colspan="10">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QRadioButton" name="render_full">
@@ -347,7 +347,7 @@
          </item>
         </layout>
        </item>
-       <item row="11" column="0" colspan="10">
+       <item row="12" column="0" colspan="10">
         <widget class="QGroupBox" name="guides_box">
          <property name="title">
           <string/>
@@ -390,21 +390,21 @@
          </layout>
         </widget>
        </item>
-       <item row="14" column="0" colspan="3">
+       <item row="15" column="0" colspan="3">
         <widget class="QPushButton" name="buttonRender">
          <property name="text">
           <string>Render to File</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="3" colspan="4">
+       <item row="15" column="3" colspan="4">
         <widget class="QPushButton" name="buttonGenerateScript">
          <property name="text">
           <string>Generate Script</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="7" colspan="2">
+       <item row="15" column="7" colspan="2">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -417,14 +417,14 @@
          </property>
         </spacer>
        </item>
-       <item row="14" column="9">
+       <item row="15" column="9">
         <widget class="KPushButton" name="buttonClose">
          <property name="text">
           <string>Close</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="0" colspan="10">
+       <item row="16" column="0" colspan="10">
         <widget class="QGroupBox" name="errorBox">
          <property name="title">
           <string/>
@@ -453,13 +453,30 @@
          </layout>
         </widget>
        </item>
-       <item row="13" column="0" colspan="10">
+       <item row="14" column="0" colspan="10">
         <widget class="QCheckBox" name="proxy_render">
          <property name="text">
           <string>Render using proxy clips</string>
          </property>
         </widget>
        </item>
+       <item row="5" column="0" colspan="3">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Encoder threads</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="4" colspan="2">
+        <widget class="KIntNumInput" name="encoder_threads">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>999</number>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">