Validate baked rotation output

Author: yibailiu

tests/test_transcode_rotation.py

@@ -6,7 +6,7 @@
 from unittest.mock import patch
 
 from videomerge.models import Canvas, CodecPlan, Orientation, ToolPaths, VideoFile
-from videomerge.transcode import build_video_filter, preprocess_file
+from videomerge.transcode import build_video_filter, preprocess_file, validate_preprocessed_output
 
 
 class TranscodeRotationTests(unittest.TestCase):
@@ -58,9 +58,62 @@ def fake_run_command(args, logger, dry_run=False):  # type: ignore[no-untyped-de
             )
 
         self.assertLess(captured_args.index("-noautorotate"), captured_args.index("-i"))
+        self.assertLess(captured_args.index("-display_rotation:v:0"), captured_args.index("-i"))
+        self.assertEqual(captured_args[captured_args.index("-display_rotation:v:0") + 1], "0")
         self.assertIn("transpose=1", captured_args[captured_args.index("-vf") + 1])
         self.assertEqual(captured_args[captured_args.index("-metadata:s:v:0") + 1], "rotate=0")
 
+    def test_validation_requires_canvas_display_size_and_zero_rotation(self) -> None:
+        source = _rotated_video()
+        output = _rotated_video().__class__(
+            path=Path("out.mp4"),
+            container="mp4",
+            video_codec="h264",
+            audio_codec="aac",
+            width=720,
+            height=1280,
+            display_width=720,
+            display_height=1280,
+            aspect_ratio="720:1280",
+            frame_rate="30/1",
+            frame_rate_float=30.0,
+            pixel_format="yuv420p",
+            duration=32.55,
+            has_audio=True,
+            orientation=Orientation.portrait,
+            rotation=0,
+        )
+
+        with patch("videomerge.transcode.probe_file", return_value=output):
+            validate_preprocessed_output(
+                Path("out.mp4"),
+                source,
+                Canvas(720, 1280),
+                ToolPaths(ffmpeg=Path("ffmpeg"), ffprobe=Path("ffprobe")),
+                logging.getLogger("test"),
+            )
+
 
 if __name__ == "__main__":
     unittest.main()
+
+
+def _rotated_video() -> VideoFile:
+    return VideoFile(
+        path=Path("11.MP4"),
+        container="mp4",
+        video_codec="h264",
+        audio_codec="aac",
+        width=1280,
+        height=720,
+        display_width=720,
+        display_height=1280,
+        aspect_ratio="720:1280",
+        frame_rate="88830000/2959519",
+        frame_rate_float=30.015,
+        pixel_format="yuv420p",
+        duration=32.55,
+        has_audio=True,
+        orientation=Orientation.portrait,
+        rotation=90,
+    )

videomerge/transcode.py

@@ -4,7 +4,9 @@
 import tempfile
 from pathlib import Path
 
+from .errors import CommandError, ProbeError
 from .models import Canvas, CodecPlan, ToolPaths, VideoFile
+from .probe import probe_file
 from .utils import run_command
 
 
@@ -68,6 +70,8 @@ def preprocess_file(
         "-y",
         "-hide_banner",
         "-noautorotate",
+        "-display_rotation:v:0",
+        "0",
         "-i",
         file.path,
     ]
@@ -142,6 +146,8 @@ def preprocess_file(
         codec_plan.output_audio_encoder,
     )
     run_command(args, logger, dry_run=dry_run)
+    if not dry_run:
+        validate_preprocessed_output(output_path, file, canvas, tools, logger)
 
 
 def build_video_filter(rotation: int, canvas: Canvas, fps: float, pad_color: str) -> str:
@@ -162,3 +168,35 @@ def build_video_filter(rotation: int, canvas: Canvas, fps: float, pad_color: str
         ]
     )
     return ",".join(filters)
+
+
+def validate_preprocessed_output(
+    output_path: Path,
+    source_file: VideoFile,
+    canvas: Canvas,
+    tools: ToolPaths,
+    logger: logging.Logger,
+) -> None:
+    try:
+        media = probe_file(output_path, tools, logger)
+    except ProbeError as exc:
+        raise CommandError(f"Could not validate preprocessed file {output_path}: {exc}") from exc
+
+    if media.rotation != 0:
+        raise CommandError(
+            f"Preprocessed file still has rotation metadata: {source_file.path.name} -> "
+            f"{output_path} rotation={media.rotation}"
+        )
+    if media.display_width != canvas.width or media.display_height != canvas.height:
+        raise CommandError(
+            f"Preprocessed file display size mismatch: {source_file.path.name} -> {output_path} "
+            f"display={media.display_width}x{media.display_height}, expected={canvas.label}"
+        )
+
+    logger.info(
+        "Validated preprocessed output: %s | display=%dx%d rotation=%d",
+        output_path.name,
+        media.display_width,
+        media.display_height,
+        media.rotation,
+    )