Merge pull request #3542 from eisneinechse/develop

Improved new codec handling
OpenShot · Jun 15, 2020 · 18e52fc · 18e52fc
2 parents ce01f98 + fc61c1a
commit 18e52fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/presets/format_webm_libav1.xml b/src/presets/format_webm_libav1.xml
@@ -9,9 +9,9 @@
 	<audiochannels>2</audiochannels>
 	<audiochannellayout>3</audiochannellayout>
 	<videobitrate
-	 low="384 kb/s"
-	 med="1.5 Mb/s"
-	 high="15.00 Mb/s"></videobitrate>
+	 low="50 crf"
+	 med="35 crf"
+	 high="10 crf"></videobitrate>
 	<audiobitrate
 	 low="96 kb/s"
 	 med="128 kb/s"

diff --git a/src/windows/export.py b/src/windows/export.py
@@ -913,7 +913,10 @@ def accept(self):
                     if ((( frame - start_frame_export ) != 0) & (( end_time_export - start_time_export ) != 0)):
                         seconds_left = round(( start_time_export - end_time_export )*( frame - end_frame_export )/( frame - start_frame_export ))
                         fps_encode = ((frame - start_frame_export)/(end_time_export-start_time_export))
-                        title_message = _("%(hours)d:%(minutes)02d:%(seconds)02d Remaining (%(fps)5.2f FPS)") % {
+                        if frame == end_frame_export:
+                            title_message = _("Finalizing video export, please wait...")
+                        else:
+                            title_message = _("%(hours)d:%(minutes)02d:%(seconds)02d Remaining (%(fps)5.2f FPS)") % {
                             'hours': seconds_left / 3600,
                             'minutes': (seconds_left / 60) % 60,
                             'seconds': seconds_left % 60,
@@ -1008,6 +1011,16 @@ def accept(self):
             # Reveal done button
             self.close_button.setVisible(True)
 
+            # Restore windows title to show elapsed time
+            title_message = _("%(hours)d:%(minutes)02d:%(seconds)02d Elapsed (%(fps)5.2f FPS)") % {
+                'hours': seconds_run / 3600,
+                'minutes': (seconds_run / 60) % 60,
+                'seconds': seconds_run % 60,
+                'fps': fps_encode}
+
+            get_app().window.ExportFrame.emit(title_message, video_settings.get("start_frame"),
+                                              video_settings.get("end_frame"), frame)
+
             # Make progress bar green (to indicate we are done)
             from PyQt5.QtGui import QPalette
             p = QPalette()