Do not use -aspect when exporting

Fixes #48
JuniorIsAJitterbug · Feb 8, 2024 · 4546e4b · 4546e4b
1 parent 192f77e
commit 4546e4b
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 27 deletions.
diff --git a/src/tbc_video_export/process/wrapper/wrapper_ffmpeg.py b/src/tbc_video_export/process/wrapper/wrapper_ffmpeg.py
@@ -371,12 +371,8 @@ def _get_aspect_ratio_opt(self) -> FlatList | None:
 
         return (
             FlatList(("-aspect", "16:9"))
-            if (
-                self._state.file_helper.tbc_json.is_widescreen
-                or self._state.opts.force_anamorphic
-                or self._state.opts.letterbox
-            )
-            else FlatList(("-aspect", "4:3"))
+            if (self._state.opts.force_anamorphic or self._state.opts.letterbox)
+            else None
         )
 
     def _get_color_opts(self) -> FlatList | None:

diff --git a/tests/test_wrappers_ffmpeg.py b/tests/test_wrappers_ffmpeg.py
@@ -247,6 +247,44 @@ def test_ffmpeg_add_filter_profile_opt(self) -> None:  # noqa: D102
 
         self.assertTrue(any(",bwdif" in cmds for cmds in cmd))
 
+    def test_ffmpeg_letterbox_opt(self) -> None:  # noqa: D102
+        _, opts = self.parse_opts([str(self.path), "pal_svideo", "--letterbox"])
+        self.files = FileHelper(opts, self.config)
+        state = ProgramState(opts, self.config, self.files)
+
+        ffmpeg_wrapper = WrapperFFmpeg(
+            state,
+            WrapperConfig[tuple[Pipe], None](
+                state.current_export_mode,
+                TBCType.CHROMA,
+                input_pipes=(self.pipe, self.pipe),
+                output_pipes=None,
+            ),
+        )
+
+        cmd = ffmpeg_wrapper.command.data
+
+        self.assertTrue({"-aspect", "16:9"}.issubset(cmd))
+
+    def test_ffmpeg_anamorphic_opt(self) -> None:  # noqa: D102
+        _, opts = self.parse_opts([str(self.path), "pal_svideo", "--force-anamorphic"])
+        self.files = FileHelper(opts, self.config)
+        state = ProgramState(opts, self.config, self.files)
+
+        ffmpeg_wrapper = WrapperFFmpeg(
+            state,
+            WrapperConfig[tuple[Pipe], None](
+                state.current_export_mode,
+                TBCType.CHROMA,
+                input_pipes=(self.pipe, self.pipe),
+                output_pipes=None,
+            ),
+        )
+
+        cmd = ffmpeg_wrapper.command.data
+
+        self.assertTrue({"-aspect", "16:9"}.issubset(cmd))
+
     def test_ffmpeg_add_invalid_filter_profile_opt(self) -> None:  # noqa: D102
         with self.assertRaises(InvalidFilterProfileError):
             _, __ = self.parse_opts(

diff --git a/tests/test_wrappers_ntsc_composite.py b/tests/test_wrappers_ntsc_composite.py
@@ -176,7 +176,6 @@ def test_ffmpeg_opts_ntsc_cvbs(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",
@@ -289,7 +288,6 @@ def test_ffmpeg_opts_ntsc_cvbs_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",
@@ -407,7 +405,6 @@ def test_ffmpeg_opts_ntsc_cvbs_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",

diff --git a/tests/test_wrappers_ntsc_composite_ld.py b/tests/test_wrappers_ntsc_composite_ld.py
@@ -194,7 +194,6 @@ def test_ffmpeg_opts_ntsc_ld(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",
@@ -307,7 +306,6 @@ def test_ffmpeg_opts_ntsc_ld_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",
@@ -425,7 +423,6 @@ def test_ffmpeg_opts_ntsc_ld_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",

diff --git a/tests/test_wrappers_ntsc_svideo.py b/tests/test_wrappers_ntsc_svideo.py
@@ -183,7 +183,6 @@ def test_ffmpeg_opts_ntsc_svideo(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",
@@ -296,7 +295,6 @@ def test_ffmpeg_opts_ntsc_svideo_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",
@@ -414,7 +412,6 @@ def test_ffmpeg_opts_ntsc_svideo_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace smpte170m",
                     "-color_primaries smpte170m",

diff --git a/tests/test_wrappers_pal_composite_.py b/tests/test_wrappers_pal_composite_.py
@@ -175,7 +175,6 @@ def test_default_ffmpeg_opts_cvbs_pal(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -288,7 +287,6 @@ def test_ffmpeg_opts_pal_cvbs_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -406,7 +404,6 @@ def test_ffmpeg_opts_pal_cvbs_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",

diff --git a/tests/test_wrappers_pal_composite_ld.py b/tests/test_wrappers_pal_composite_ld.py
@@ -182,7 +182,6 @@ def test_ffmpeg_opts_pal_ld(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -295,7 +294,6 @@ def test_ffmpeg_opts_pal_ld_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -413,7 +411,6 @@ def test_ffmpeg_opts_pal_ld_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",

diff --git a/tests/test_wrappers_pal_svideo.py b/tests/test_wrappers_pal_svideo.py
@@ -181,7 +181,6 @@ def test_ffmpeg_opts_pal_svideo(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -294,7 +293,6 @@ def test_ffmpeg_opts_pal_svideo_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -412,7 +410,6 @@ def test_ffmpeg_opts_pal_svideo_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate pal",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",

diff --git a/tests/test_wrappers_palm_svideo.py b/tests/test_wrappers_palm_svideo.py
@@ -181,7 +181,6 @@ def test_ffmpeg_opts_palm_svideo(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -294,7 +293,6 @@ def test_ffmpeg_opts_palm_svideo_luma(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",
@@ -412,7 +410,6 @@ def test_ffmpeg_opts_palm_svideo_luma_4fsc(self) -> None:
                     "-map [v_output]",
                     "-timecode 00:00:00:00",
                     "-framerate ntsc",
-                    "-aspect 4:3",
                     "-color_range tv",
                     "-colorspace bt470bg",
                     "-color_primaries bt470bg",