Version 2.3.2 (#41)

* Fixing #39 HEVC two pass bitrate does not work (thanks to schlotkins)

Author: cdgriffith

CHANGES

@@ -1,6 +1,12 @@
 Changelog
 ---------
 
+Version 2.3.2
+~~~~~~~~~~~~~
+
+* Fixing #39 HEVC two pass bitrate does not work (thanks to schlotkins)
+
+
 Version 2.3.1
 ~~~~~~~~~~~~~
 

fastflix/plugins/av1/command_builder.py

@@ -10,7 +10,7 @@ def build(source, video_track, bitrate=None, crf=None, start_time=0, duration=No
     filters = helpers.generate_filters(**kwargs)
     audio = build_audio(audio_tracks)
 
-    ending = "dev/null && \\"
+    ending = "/dev/null"
     if reusables.win_based:
         ending = "NUL"
 

fastflix/plugins/av1/settings_panel.py

@@ -151,3 +151,4 @@ def new_source(self):
 
     def set_mode(self, x):
         self.mode = x.text()
+        self.main.build_commands()

fastflix/plugins/hevc/command_builder.py

@@ -31,7 +31,7 @@ def build(
     audio = build_audio(audio_tracks)
     subtitles = build_subtitle(subtitle_tracks)
 
-    ending = "dev/null && \\"
+    ending = "/dev/null"
     if reusables.win_based:
         ending = "NUL"
 
@@ -81,18 +81,24 @@ def build(
     if intra_encoding:
         x265_params.append("keyint=1")
 
-    if x265_params:
-        beginning += '-x265-params "{}" '.format(":".join(x265_params))
-
     if side_data.cll:
         pass
 
     extra_data = "-map_chapters 0 "  # -map_metadata 0 # safe to do for rotation?
 
+    def get_x265_params(params=()):
+        if not isinstance(params, (list, tuple)):
+            params = [params]
+        all_params = x265_params + list(params)
+        return '-x265-params "{}" '.format(":".join(all_params)) if all_params else ""
+
     if bitrate:
-        command_1 = f'{beginning}:pass=1 -passlogfile "<tempfile.1.log>" -b:v {bitrate} -an -f mp4 {ending}'
+        command_1 = (
+            f'{beginning} {get_x265_params(["pass=1"])} '
+            f'-passlogfile "<tempfile.1.log>" -b:v {bitrate} -preset {preset} -an -sn -dn -f mp4 {ending}'
+        )
         command_2 = (
-            f'{beginning}:pass=2 -passlogfile "<tempfile.1.log>" '
+            f'{beginning} {get_x265_params(["pass=2"])} -passlogfile "<tempfile.1.log>" '
             f'-b:v {bitrate} -preset {preset} {audio} {subtitles} {extra_data} "{{output}}"'
         )
         return [
@@ -101,7 +107,10 @@ def build(
         ]
 
     elif crf:
-        command = f'{beginning} -crf {crf} -preset {preset} {audio} {subtitles} {extra_data} "{{output}}"'
+        command = (
+            f"{beginning} {get_x265_params()}  -crf {crf} "
+            f'-preset {preset} {audio} {subtitles} {extra_data} "{{output}}"'
+        )
         return [Command(command, ["ffmpeg", "output"], False, name="Single pass CRF", exe="ffmpeg")]
 
     else:

fastflix/plugins/hevc/settings_panel.py

@@ -226,3 +226,4 @@ def new_source(self):
 
     def set_mode(self, x):
         self.mode = x.text()
+        self.main.build_commands()

fastflix/plugins/svt_av1/settings_panel.py

@@ -182,3 +182,4 @@ def new_source(self):
 
     def set_mode(self, x):
         self.mode = x.text()
+        self.main.build_commands()

fastflix/plugins/vp9/command_builder.py

@@ -24,7 +24,7 @@ def build(
     filters = generate_filters(**kwargs)
     audio = build_audio(audio_tracks)
 
-    ending = "dev/null && \\"
+    ending = "/dev/null"
     if reusables.win_based:
         ending = "NUL"
 

fastflix/plugins/vp9/settings_panel.py

@@ -228,3 +228,4 @@ def new_source(self):
 
     def set_mode(self, x):
         self.mode = x.text()
+        self.main.build_commands()

fastflix/version.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "2.3.1"
+__version__ = "2.3.2"
 __author__ = "Chris Griffith"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastflix"
-version = "2.3.1"
+version = "2.3.2"
 description = "Easy to use video encoder GUI wrapper"
 authors = ["Chris Griffith <chris@cdgriffith.com>"]
 license = "MIT"