Use correct SAR with --force-anamorphic and --letterbox

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

Hide file tree

Showing 4 changed files with 86 additions and 49 deletions.
diff --git a/src/tbc_video_export/process/wrapper/wrapper_ffmpeg.py b/src/tbc_video_export/process/wrapper/wrapper_ffmpeg.py
@@ -52,7 +52,6 @@ def command(self) -> FlatList:  # noqa: D102
                 self._get_map_opts(),
                 self._get_timecode_opt(),
                 self._get_framerate_opt(),
-                self._get_aspect_ratio_opt(),
                 self._get_color_range_opt(),
                 self._get_color_opts(),
                 self._get_format_opts(),
@@ -228,6 +227,9 @@ def _get_filter_complex_opts(self) -> FlatList:
             else ""
         )
 
+        if self._state.opts.force_anamorphic or self._state.opts.letterbox:
+            common_filters.append(self._get_widescreen_aspect_ratio_filter())
+
         # override profile colorlevels if set with opt
         if self._state.opts.force_black_level is not None:
             common_filters.append(
@@ -363,17 +365,14 @@ def _get_framerate_opt(self) -> FlatList:
             )
         )
 
-    def _get_aspect_ratio_opt(self) -> FlatList | None:
-        """Return opts for aspect ratio."""
-        # do not add AR flag to file, as it must match the rawvideo from chroma on merge
-        if self._is_two_step_luma_mode():
-            return None
+    def _get_widescreen_aspect_ratio_filter(self) -> str:
+        """Return filter for widescreen aspect ratio."""
+        match self._state.video_system:
+            case VideoSystem.PAL:
+                return "setsar=512/461:max=1000"
 
-        return (
-            FlatList(("-aspect", "16:9"))
-            if (self._state.opts.force_anamorphic or self._state.opts.letterbox)
-            else None
-        )
+            case VideoSystem.NTSC | VideoSystem.PAL_M:
+                return "setsar=194/171:max=1000"
 
     def _get_color_opts(self) -> FlatList | None:
         """Return opts for color settings."""

diff --git a/tests/test_wrappers_ffmpeg.py b/tests/test_wrappers_ffmpeg.py
@@ -247,44 +247,6 @@ 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_svideo.py b/tests/test_wrappers_ntsc_svideo.py
@@ -64,6 +64,44 @@ def test_decoder_default_luma_decoder_ntsc_svideo(self) -> None:  # noqa: D102
             f"PIPE_OUT",
         )
 
+    def test_ffmpeg_letterbox_ntsc_opt(self) -> None:  # noqa: D102
+        _, opts = self.parse_opts([str(self.path), "ntsc_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(any("setsar=194/171:max=1000" in cmds for cmds in cmd))
+
+    def test_ffmpeg_anamorphic_ntsc_opt(self) -> None:  # noqa: D102
+        _, opts = self.parse_opts([str(self.path), "ntsc_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(any("setsar=194/171:max=1000" in cmds for cmds in cmd))
+
     def test_decoder_default_chroma_decoder_ntsc_svideo(self) -> None:  # noqa: D102
         _, opts = self.parse_opts([str(self.path), "ntsc_svideo", "--threads", "4"])
         self.files = FileHelper(opts, self.config)

diff --git a/tests/test_wrappers_pal_svideo.py b/tests/test_wrappers_pal_svideo.py
@@ -63,6 +63,44 @@ def test_decoder_default_luma_decoder_pal_svideo(self) -> None:  # noqa: D102
             f"PIPE_OUT",
         )
 
+    def test_ffmpeg_letterbox_pal_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(any("setsar=512/461:max=1000" in cmds for cmds in cmd))
+
+    def test_ffmpeg_anamorphic_pal_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(any("setsar=512/461:max=1000" in cmds for cmds in cmd))
+
     def test_decoder_default_chroma_decoder_pal_svideo(self) -> None:  # noqa: D102
         _, opts = self.parse_opts([str(self.path), "pal_svideo", "--threads", "4"])
         self.files = FileHelper(opts, self.config)