Commit 71174b4e authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle Committed by Vincent PINON

Remove the MLT processing threads option that never really worked and crashes movit

Conflicts:
	src/renderer.cpp
parent 76343987
......@@ -277,11 +277,6 @@
<label>FFplay / avplay binary path.</label>
<default></default>
</entry>
<entry name="mltthreads" type="Int">
<label>Mlt processing thread count.</label>
<default>1</default>
</entry>
<entry name="proxythreads" type="Int">
<label>Proxy creation processing thread count.</label>
......
......@@ -89,7 +89,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
m_configEnv.rendererpathurl->lineEdit()->setObjectName("kcfg_rendererpath");
m_configEnv.ffmpegurl->lineEdit()->setObjectName("kcfg_ffmpegpath");
m_configEnv.ffplayurl->lineEdit()->setObjectName("kcfg_ffplaypath");
m_configEnv.kcfg_mltthreads->setMaximum( QThread::idealThreadCount() < 4 ? QThread::idealThreadCount() : 3 );
m_configEnv.tmppathurl->setMode(KFile::Directory);
m_configEnv.tmppathurl->lineEdit()->setObjectName("kcfg_currenttmpfolder");
m_configEnv.projecturl->setMode(KFile::Directory);
......
......@@ -435,7 +435,7 @@ bool MltDeviceCapture::slotStartCapture(const QString &params, const QString &pa
/*kDebug()<<"-- CREATING CAP: "<<params<<", PATH: "<<path;
tmp = qstrdup(QString("avformat:" + path).toUtf8().constData());
m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
m_mltConsumer->set("real_time", -KdenliveSettings::mltthreads());
m_mltConsumer->set("real_time", -1);
delete[] tmp;*/
m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "multi");
......@@ -453,7 +453,7 @@ bool MltDeviceCapture::slotStartCapture(const QString &params, const QString &pa
Mlt::Properties *renderProps = new Mlt::Properties;
renderProps->set("mlt_service", "avformat");
renderProps->set("target", path.toUtf8().constData());
renderProps->set("real_time", -KdenliveSettings::mltthreads());
renderProps->set("real_time", -1);
//renderProps->set("terminate_on_pause", 0);
renderProps->set("mlt_profile", m_activeProfile.toUtf8().constData());
......
......@@ -142,7 +142,7 @@ void MeltJob::startJob()
//m_consumer->set("terminate_on_pause", 1 );
//m_consumer->set("eof", "pause" );
m_consumer->set("real_time", -KdenliveSettings::mltthreads() );
m_consumer->set("real_time", -1 );
list = consumerParams.split(QLatin1Char(' '), QString::SkipEmptyParts);
......
......@@ -64,7 +64,7 @@ void ProxyJob::startJob()
mltParameters << t;
}
mltParameters.append(QString::fromLatin1("real_time=-%1").arg(KdenliveSettings::mltthreads()));
mltParameters.append(QString::fromLatin1("real_time=-1"));
//TODO: currently, when rendering an xml file through melt, the display ration is lost, so we enforce it manualy
double display_ratio;
......
......@@ -242,8 +242,8 @@ void Render::buildConsumer(const QString &profileName)
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
m_mltConsumer->set("buffer", "1");
m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
m_mltConsumer->set("buffer", "5");
m_mltConsumer->set("real_time", 1);
}
if (m_mltConsumer && m_mltConsumer->is_valid()) {
return;
......@@ -323,7 +323,7 @@ void Render::buildConsumer(const QString &profileName)
m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData());
m_mltConsumer->set("frequency", 48000);
m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
m_mltConsumer->set("real_time", 1);
}
Mlt::Producer *Render::invalidProducer(const QString &id)
......@@ -1784,7 +1784,7 @@ void Render::setDropFrames(bool show)
{
QMutexLocker locker(&m_mutex);
if (m_mltConsumer) {
int dropFrames = KdenliveSettings::mltthreads();
int dropFrames = 1;
if (show == false) dropFrames = -dropFrames;
m_mltConsumer->stop();
m_mltConsumer->set("real_time", dropFrames);
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>367</width>
<height>318</height>
<height>253</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
......@@ -34,7 +34,7 @@
<string>MLT environment</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
<item row="5" column="1">
<item row="4" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -47,7 +47,7 @@
</property>
</spacer>
</item>
<item row="3" column="1" colspan="3">
<item row="3" column="1" colspan="2">
<widget class="KUrlRequester" name="rendererpathurl"/>
</item>
<item row="3" column="0">
......@@ -57,33 +57,6 @@
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QLabel" name="label_7">
<property name="text">
<string>(&gt;1 is experimental)</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2">
<widget class="QSpinBox" name="kcfg_mltthreads">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimum">
<number>1</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Processing threads</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
......@@ -98,10 +71,10 @@
</property>
</widget>
</item>
<item row="2" column="1" colspan="3">
<item row="2" column="1" colspan="2">
<widget class="KUrlRequester" name="mltpathurl"/>
</item>
<item row="0" column="1" colspan="3">
<item row="0" column="1" colspan="2">
<widget class="KUrlRequester" name="ffmpegurl"/>
</item>
<item row="1" column="0">
......@@ -111,7 +84,7 @@
</property>
</widget>
</item>
<item row="1" column="1" colspan="3">
<item row="1" column="1" colspan="2">
<widget class="KUrlRequester" name="ffplayurl"/>
</item>
</layout>
......@@ -258,19 +231,6 @@
</widget>
</widget>
</item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
......
......@@ -976,7 +976,7 @@ void RenderWidget::slotExport(bool scriptExport, int zoneIn, int zoneOut, const
if (!renderArgs.contains("threads=")) {
renderArgs.append(QString(" threads=%1").arg(KdenliveSettings::encodethreads()));
}
renderArgs.append(QString(" real_time=-%1").arg(KdenliveSettings::mltthreads()));
renderArgs.append(QString(" real_time=-1"));
// Check if the rendering profile is different from project profile,
// in which case we need to use the producer_comsumer from MLT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment