Fix timeline preview rendering on 24fps projects

CCBUG: 364106
Ref: T1949
parent 6713cbd1
......@@ -16,8 +16,8 @@ x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast thre
MPEG=qscale=4 ab=192k vcodec=mpeg2video acodec=mp2 threads=%threads;mpg
[timelinepreview]
DNxHD 1080p 25fps=r=25 vb=120000k threads=0 vcodec=dnxhd s=1920x1080;mov
DNxHD 1080p 24fps=r=24 vb=115000k threads=0 vcodec=dnxhd s=1920x1080;mov
DNxHD 1080p 30fps=r=30 vb=145000k threads=0 vcodec=dnxhd s=1920x1080;mov
DNxHD 1080p 23.976fps=r=23.976 vb=115000k threads=0 vcodec=dnxhd s=1920x1080;mov
DNxHD 1080p 25fps=r=25 vb=120M threads=0 vcodec=dnxhd;mov
DNxHD 1080p 24fps=r=24 vb=115M threads=0 vcodec=dnxhd;mov
DNxHD 1080p 30fps=r=30 vb=145M threads=0 vcodec=dnxhd;mov
DNxHD 1080p 23.976fps=r=23.976 vb=115M threads=0 vcodec=dnxhd;mov
MP4=vcodec=libx264 threads=0;mp4
......@@ -1543,7 +1543,7 @@ void MainWindow::slotEditProjectSettings()
QPointer<ProjectSettings> w = new ProjectSettings(project, project->metadata(), pCore->projectManager()->currentTimeline()->projectView()->extractTransitionsLumas(), p.x(), p.y(), project->projectFolder().path(), true, !project->isModified(), this);
connect(w, SIGNAL(disableProxies()), this, SLOT(slotDisableProxies()));
connect(w, SIGNAL(disablePreview()), project, SLOT(invalidateRange()));
connect(w, SIGNAL(disablePreview()), pCore->projectManager()->currentTimeline(), SLOT(invalidateRange()));
connect(w, SIGNAL(refreshProfiles()), this, SLOT(slotRefreshProfiles()));
if (w->exec() == QDialog::Accepted) {
......
......@@ -192,6 +192,13 @@ bool PreviewManager::loadParams()
if (m_consumerParams.isEmpty() || m_extension.isEmpty()) {
return false;
}
//remove the r=... parameter (forcing framerate) as it causes rendering failure
for (int i = 0; i < m_consumerParams.count(); i++) {
if (m_consumerParams.at(i).startsWith(QStringLiteral("r="))) {
m_consumerParams.removeAt(i);
break;
}
}
m_consumerParams << "an=1";
if (KdenliveSettings::gpu_accel())
m_consumerParams << "glsl.=1";
......@@ -422,7 +429,7 @@ void PreviewManager::doPreviewRender(QString scene)
break;
}
}
QFile::remove(scene);
//QFile::remove(scene);
m_abortPreview = false;
}
......
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