From 0528494d9e53368275754befa73bea7dcf7948dd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 10 Aug 2022 16:10:52 +0200
Subject: [PATCH] extract review can scale to match pixel ratio

---
 openpype/plugins/publish/extract_review.py | 63 ++++++++--------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index 7442d3aacb..e16f324e0a 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -1210,7 +1210,6 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
         # Get instance data
         pixel_aspect = temp_data["pixel_aspect"]
-
         if reformat_in_baking:
             self.log.debug((
                 "Using resolution from input. It is already "
@@ -1230,6 +1229,10 @@ class ExtractReview(pyblish.api.InstancePlugin):
         # - settings value can't have None but has value of 0
         output_width = output_def.get("width") or output_width or None
         output_height = output_def.get("height") or output_height or None
+        # Force to use input resolution if output resolution was not defined
+        #   in settings. Resolution from instance is not used when
+        #   'use_input_res' is set to 'True'.
+        use_input_res = False
 
         # Overscal color
         overscan_color_value = "black"
@@ -1241,6 +1244,17 @@ class ExtractReview(pyblish.api.InstancePlugin):
             )
         self.log.debug("Overscan color: `{}`".format(overscan_color_value))
 
+        # Scale input to have proper pixel aspect ratio
+        # - scale width by the pixel aspect ratio
+        scale_pixel_aspect = output_def.get("scale_pixel_aspect", True)
+        if scale_pixel_aspect and pixel_aspect != 1:
+            # Change input width after pixel aspect
+            input_width = int(input_width * pixel_aspect)
+            use_input_res = True
+            filters.append((
+                "scale={}x{}:flags=lanczos".format(input_width, input_height)
+            ))
+
         # Convert overscan value video filters
         overscan_crop = output_def.get("overscan_crop")
         overscan = OverscanCrop(
@@ -1251,13 +1265,10 @@ class ExtractReview(pyblish.api.InstancePlugin):
         #   resolution by it's values
         if overscan_crop_filters:
             filters.extend(overscan_crop_filters)
+            # Change input resolution after overscan crop
             input_width = overscan.width()
             input_height = overscan.height()
-            # Use output resolution as inputs after cropping to skip usage of
-            #   instance data resolution
-            if output_width is None or output_height is None:
-                output_width = input_width
-                output_height = input_height
+            use_input_res = True
 
         # Make sure input width and height is not an odd number
         input_width_is_odd = bool(input_width % 2 != 0)
@@ -1283,8 +1294,10 @@ class ExtractReview(pyblish.api.InstancePlugin):
         self.log.debug("input_width: `{}`".format(input_width))
         self.log.debug("input_height: `{}`".format(input_height))
 
-        # Use instance resolution if output definition has not set it.
-        if output_width is None or output_height is None:
+        # Use instance resolution if output definition has not set it
+        #   - use instance resolution only if there were not scale changes
+        #       that may massivelly affect output 'use_input_res'
+        if not use_input_res and output_width is None or output_height is None:
             output_width = temp_data["resolution_width"]
             output_height = temp_data["resolution_height"]
 
@@ -1326,7 +1339,6 @@ class ExtractReview(pyblish.api.InstancePlugin):
             output_width == input_width
             and output_height == input_height
             and not letter_box_enabled
-            and pixel_aspect == 1
         ):
             self.log.debug(
                 "Output resolution is same as input's"
@@ -1336,39 +1348,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
             new_repre["resolutionHeight"] = input_height
             return filters
 
-        # defining image ratios
-        input_res_ratio = (
-            (float(input_width) * pixel_aspect) / input_height
-        )
-        output_res_ratio = float(output_width) / float(output_height)
-        self.log.debug("input_res_ratio: `{}`".format(input_res_ratio))
-        self.log.debug("output_res_ratio: `{}`".format(output_res_ratio))
-
-        # Round ratios to 2 decimal places for comparing
-        input_res_ratio = round(input_res_ratio, 2)
-        output_res_ratio = round(output_res_ratio, 2)
-
-        # get scale factor
-        scale_factor_by_width = (
-            float(output_width) / (input_width * pixel_aspect)
-        )
-        scale_factor_by_height = (
-            float(output_height) / input_height
-        )
-
-        self.log.debug(
-            "scale_factor_by_with: `{}`".format(scale_factor_by_width)
-        )
-        self.log.debug(
-            "scale_factor_by_height: `{}`".format(scale_factor_by_height)
-        )
-
         # scaling none square pixels and 1920 width
-        if (
-            input_height != output_height
-            or input_width != output_width
-            or pixel_aspect != 1
-        ):
+        if input_height != output_height or input_width != output_width:
             filters.extend([
                 (
                     "scale={}x{}"