Fix Display Aspect Ratio by forcing resolution

utils/upcale.py

@@ -2,9 +2,8 @@ import os
 import sys
 import subprocess
 
-from utils.mediainfo import get_framerate
+from utils.mediainfo import get_framerate, get_video_resolution
 
-MAX_INPUT_WIDTH  = '720'
 
 def _re_encode(
     source_video: str, 
@@ -21,8 +20,20 @@ def _re_encode(
     """
 
     fps = get_framerate(source_video)
+    resolution = get_video_resolution(source_video)
+    
+    scale = "720:480"
 
-    vf_filter = f"fps={fps},scale=-1:min({MAX_INPUT_WIDTH}\\,ih)"
+    if input_aspect == "16:9" and resolution[1] == 480:
+        scale = "854:480"
+    elif input_aspect == "16:9" and resolution[1] == 540:
+        scale = "960:540"
+    elif input_aspect == "16:9" and resolution[1] >= 720:
+        scale = "1280:720"
+
+    print(f"Scaling at            : {scale}")
+
+    vf_filter = f"fps={fps},scale={scale},setsar=1"
 
     cmd = [
         "ffmpeg", "-v", "quiet", "-stats",
@@ -47,10 +58,7 @@ def _re_encode(
         print(f"\nffmpeg failed with error code {e.returncode} at _re_encode()", file=sys.stderr)
         sys.exit(e.returncode)
 
-def _upscale(
-    upscale_output: str,
-    input_aspect: str = "16:9"
-):
+def _upscale(upscale_output: str):
     print('Started Upscale')
 
     vapoursynth_script = os.path.join('utils', 'vs-realesrgan.vpy')
@@ -76,7 +84,6 @@ def _upscale(
                 "-i", "-",
                 "-c:v", "hevc_nvenc",
                 "-qp", "5",
-                "-aspect", input_aspect,
                 upscale_output
             ],
             stdin=vspipe.stdout
@@ -108,7 +115,7 @@ def upscale(
     temp_out_video = os.path.join('1-Temp', 'source.mkv')
 
     _re_encode(source_video, temp_out_video, input_aspect)
-    _upscale(upscaled_video_output, input_aspect)
+    _upscale(upscaled_video_output)
     
     # Remove Temp Files
     os.remove(temp_out_video)