From kde-commits  Sun Dec 04 16:55:38 2016
From: Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date: Sun, 04 Dec 2016 16:55:38 +0000
To: kde-commits
Subject: [kdenlive/Applications/16.12] src: Fix black frame at end when rendering full project
Message-Id: <E1cDa4g-00008M-Eq () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=148087054727652

Git commit 9869d0b0cd75958cf2de3b53a57d578887dd7ba2 by Jean-Baptiste Mardel=
le.
Committed on 04/12/2016 at 16:37.
Pushed by mardelle into branch 'Applications/16.12'.

Fix black frame at end when rendering full project
CCBUG: 373072

M  +3    -4    src/dialogs/renderwidget.cpp
M  +9    -12   src/mainwindow.cpp

https://commits.kde.org/kdenlive/9869d0b0cd75958cf2de3b53a57d578887dd7ba2

diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index c367ae1..5ff1006 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -1106,14 +1106,13 @@ void RenderWidget::slotExport(bool scriptExport, in=
t zoneIn, int zoneOut,
                 zoneOut /=3D ratio;
             }
         }
-
-        if (m_view.render_zone->isChecked()) {
-            render_process_args << "in=3D" + QString::number(zoneIn) << "o=
ut=3D" + QString::number(zoneOut);
-        } else if (m_view.render_guide->isChecked()) {
+        if (m_view.render_guide->isChecked()) {
             double fps =3D (double) m_profile.frame_rate_num / m_profile.f=
rame_rate_den;
             double guideStart =3D m_view.guide_start->itemData(m_view.guid=
e_start->currentIndex()).toDouble();
             double guideEnd =3D m_view.guide_end->itemData(m_view.guide_en=
d->currentIndex()).toDouble();
             render_process_args << "in=3D" + QString::number((int) GenTime=
(guideStart).frames(fps)) << "out=3D" + QString::number((int) GenTime(guide=
End).frames(fps));
+        } else {
+            render_process_args << "in=3D" + QString::number(zoneIn) << "o=
ut=3D" + QString::number(zoneOut);
         }
 =

         if (!overlayargs.isEmpty())
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index db185af..da0c844 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3312,15 +3312,16 @@ void MainWindow::slotPrepareRendering(bool scriptEx=
port, bool zoneOnly, const QS
         temp.open();
         playlistPath =3D temp.fileName();
     }
+    int in =3D 0;
+    int out;
+    if (zoneOnly) {
+        in =3D pCore->projectManager()->currentTimeline()->inPoint();
+        out =3D pCore->projectManager()->currentTimeline()->outPoint();
+    } else {
+        out =3D (int) GenTime(project->projectDuration()).frames(project->=
fps()) - 2;
+    }
     QString playlistContent =3D pCore->projectManager()->projectSceneList(=
project->url().adjusted(QUrl::RemoveFilename).path());
     if (!chapterFile.isEmpty()) {
-        int in =3D 0;
-        int out;
-        if (!zoneOnly) out =3D (int) GenTime(project->projectDuration()).f=
rames(project->fps());
-        else {
-            in =3D pCore->projectManager()->currentTimeline()->inPoint();
-            out =3D pCore->projectManager()->currentTimeline()->outPoint();
-        }
         QDomDocument doc;
         QDomElement chapters =3D doc.createElement(QStringLiteral("chapter=
s"));
         chapters.setAttribute(QStringLiteral("fps"), project->fps());
@@ -3507,11 +3508,7 @@ void MainWindow::slotPrepareRendering(bool scriptExp=
ort, bool zoneOnly, const QS
         }
         file.close();
     }
-    m_renderWidget->slotExport(scriptExport,
-            pCore->projectManager()->currentTimeline()->inPoint(),
-            pCore->projectManager()->currentTimeline()->outPoint(),
-            project->metadata(),
-            playlistPaths, trackNames, scriptPath, exportAudio);
+    m_renderWidget->slotExport(scriptExport, in, out,project->metadata(), =
playlistPaths, trackNames, scriptPath, exportAudio);
 }
 =

 void MainWindow::slotUpdateTimecodeFormat(int ix)