* Fixing #330 "Remove Metadata" only removes video metadata for Rigay…

…a's hardware encoders (thanks to wynterca)
cdgriffith · Apr 24, 2022 · ce69aec · ce69aec
1 parent 4a530ef
commit ce69aec
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 6 deletions.
diff --git a/CHANGES b/CHANGES
@@ -9,6 +9,7 @@
 * Fixing #327 FastFlix Duplicates encoding task and encodes same movie to infinity (thanks to Wontell)
 * Fixing #324 NVEncC wrong Interlace Value set by FastFlix (thanks to Wontell)
 * Fixing #278 FastFlix occasionally getting stuck on a single video in a queue (thanks to kamild1996)
+* Fixing #330 "Remove Metadata" only removes video metadata for Rigaya's hardware encoders (thanks to wynterca)
 * Fixing level was not being passed to hardware encoders
 
 ## Version 4.8.1

diff --git a/fastflix/encoders/nvencc_avc/command_builder.py b/fastflix/encoders/nvencc_avc/command_builder.py
@@ -100,7 +100,11 @@ def build(fastflix: FastFlix):
         transform,
         (f'--output-res {video.video_settings.scale.replace(":", "x")}' if video.video_settings.scale else ""),
         crop,
-        (f"--video-metadata clear" if video.video_settings.remove_metadata else "--video-metadata copy"),
+        (
+            f"--video-metadata clear --metadata clear"
+            if video.video_settings.remove_metadata
+            else "--video-metadata copy  --metadata copy"
+        ),
         (f'--video-metadata title="{video.video_settings.video_title}"' if video.video_settings.video_title else ""),
         ("--chapter-copy" if video.video_settings.copy_chapters else ""),
         "-c",

diff --git a/fastflix/encoders/nvencc_hevc/command_builder.py b/fastflix/encoders/nvencc_hevc/command_builder.py
@@ -124,7 +124,11 @@ def build(fastflix: FastFlix):
         transform,
         (f'--output-res {video.video_settings.scale.replace(":", "x")}' if video.video_settings.scale else ""),
         crop,
-        (f"--video-metadata clear" if video.video_settings.remove_metadata else "--video-metadata copy"),
+        (
+            f"--video-metadata clear --metadata clear"
+            if video.video_settings.remove_metadata
+            else "--video-metadata copy  --metadata copy"
+        ),
         (f'--video-metadata title="{video.video_settings.video_title}"' if video.video_settings.video_title else ""),
         ("--chapter-copy" if video.video_settings.copy_chapters else ""),
         "-c",

diff --git a/fastflix/encoders/qsvencc_avc/command_builder.py b/fastflix/encoders/qsvencc_avc/command_builder.py
@@ -114,7 +114,11 @@ def build(fastflix: FastFlix):
         transform,
         (f'--output-res {video.video_settings.scale.replace(":", "x")}' if video.video_settings.scale else ""),
         crop,
-        (f"--video-metadata clear" if video.video_settings.remove_metadata else "--video-metadata copy"),
+        (
+            f"--video-metadata clear --metadata clear"
+            if video.video_settings.remove_metadata
+            else "--video-metadata copy  --metadata copy"
+        ),
         (f'--video-metadata title="{video.video_settings.video_title}"' if video.video_settings.video_title else ""),
         ("--chapter-copy" if video.video_settings.copy_chapters else ""),
         "-c",

diff --git a/fastflix/encoders/qsvencc_hevc/command_builder.py b/fastflix/encoders/qsvencc_hevc/command_builder.py
@@ -114,7 +114,11 @@ def build(fastflix: FastFlix):
         transform,
         (f'--output-res {video.video_settings.scale.replace(":", "x")}' if video.video_settings.scale else ""),
         crop,
-        (f"--video-metadata clear" if video.video_settings.remove_metadata else "--video-metadata copy"),
+        (
+            f"--video-metadata clear --metadata clear"
+            if video.video_settings.remove_metadata
+            else "--video-metadata copy  --metadata copy"
+        ),
         (f'--video-metadata title="{video.video_settings.video_title}"' if video.video_settings.video_title else ""),
         ("--chapter-copy" if video.video_settings.copy_chapters else ""),
         "-c",

diff --git a/fastflix/encoders/vceencc_avc/command_builder.py b/fastflix/encoders/vceencc_avc/command_builder.py
@@ -87,7 +87,11 @@ def build(fastflix: FastFlix):
         transform,
         (f'--output-res {video.video_settings.scale.replace(":", "x")}' if video.video_settings.scale else ""),
         crop,
-        (f"--video-metadata clear" if video.video_settings.remove_metadata else "--video-metadata copy"),
+        (
+            f"--video-metadata clear --metadata clear"
+            if video.video_settings.remove_metadata
+            else "--video-metadata copy  --metadata copy"
+        ),
         (f'--video-metadata title="{video.video_settings.video_title}"' if video.video_settings.video_title else ""),
         ("--chapter-copy" if video.video_settings.copy_chapters else ""),
         "-c",

diff --git a/fastflix/encoders/vceencc_hevc/command_builder.py b/fastflix/encoders/vceencc_hevc/command_builder.py
@@ -101,7 +101,11 @@ def build(fastflix: FastFlix):
         transform,
         (f'--output-res {video.video_settings.scale.replace(":", "x")}' if video.video_settings.scale else ""),
         crop,
-        (f"--video-metadata clear" if video.video_settings.remove_metadata else "--video-metadata copy"),
+        (
+            f"--video-metadata clear --metadata clear"
+            if video.video_settings.remove_metadata
+            else "--video-metadata copy  --metadata copy"
+        ),
         (f'--video-metadata title="{video.video_settings.video_title}"' if video.video_settings.video_title else ""),
         ("--chapter-copy" if video.video_settings.copy_chapters else ""),
         "-c",