Fix Display Aspect Ratio by forcing resolution

Start.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+
+# Change the directory to where the script is
+cd "$SCRIPT_DIR"
+
+# Path to your virtual environment
+VENV_PATH="$SCRIPT_DIR/.venv"
+source "$VENV_PATH/bin/activate"
+
+# Path to your Python script
+SCRIPT_PATH="$SCRIPT_DIR/Start.py"
+
+# Run the Python script
+python "$SCRIPT_PATH"
+
+# Deactivate the virtual environment
+deactivate
+
+read -p "Press Enter to exit..."

utils/encode_downloads.py

@@ -21,10 +21,10 @@ def _encode_video(
     hentai_title: str, 
     input_aspect: str = "16:9"
 ):
-    print(f'Encoding {preset['h']}p AV1')
+    print(f"Encoding {preset['h']}p x265")
 
     cmd = [
-        "ffmpeg",
+        "ffmpeg", "-v", "quiet", "-stats",
         "-i", preset['input_video'],
         "-i", source_video,
         "-map", "0:v:0", # Video from upscale or interpolated file
@@ -33,23 +33,21 @@ def _encode_video(
         "-map", "1:t?",  # Attachments from source video (optional)
         "-map", "1:d?",  # Other Data from source video (optional)
         "-disposition:v:0", "default", # Mark video as default in mkv container
-        "-metadata", f'Title=\"{hentai_title} [hstream.moe]\"',
-        "-c:v", "libsvtav1",
+        "-metadata", f"Title={hentai_title} [hstream.moe]",
+        "-c:v", "libx265",
         "-crf", preset['crf'],
-        "-preset", "4",
-        "-pix_fmt", "yuv420p10le", # 10bit
-        "-vf", f"scale=\'min({preset['w']},iw)\':-2,setsar=1:1",
+        "-preset", "slow",
+        "-pix_fmt", "yuv420p10le",
+        "-vf", f"scale=min({preset['w']}\\,iw):-2,setsar=1:1",
         "-aspect", input_aspect,
         "-c:a", "libopus",
-        "-b:a", "160k",
+        "-b:a", "128k",
         "-c:s", "copy",
         output_video
     ]
 
-    print(cmd)
-
     try:
-        subprocess.run(cmd, shell=True, check=True)
+        subprocess.run(cmd, check=True)
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)
@@ -64,13 +62,13 @@ def encode_downloads(
     input_aspect: str = "16:9"
 ):
     presets = [
-        {"w": "1920", "h": "1080", "crf": "22", "name": "[1080p-AV1]",        "input_video": upscaled_video},
-        {"w": "1920", "h": "1080", "crf": "22", "name": "[1080p-AV1][48fps]", "input_video": interpolated_video},
-        {"w": "3840", "h": "2160", "crf": "24", "name": "[2160p-AV1]",        "input_video": upscaled_video},
+        {"w": "1920", "h": "1080", "crf": "22", "name": "[1080p-x265]",        "input_video": upscaled_video},
+        {"w": "1920", "h": "1080", "crf": "22", "name": "[1080p-x265][48fps]", "input_video": interpolated_video},
+        {"w": "3840", "h": "2160", "crf": "24", "name": "[2160p-x265]",        "input_video": upscaled_video},
     ]
 
     if interpolated_uhd_video is not None:
-        presets.append({"w": "3840", "h": "2160", "crf": "24", "name": "[2160p-AV1][48fps]", "input_video": interpolated_uhd_video})
+        presets.append({"w": "3840", "h": "2160", "crf": "24", "name": "[2160p-x265][48fps]", "input_video": interpolated_uhd_video})
 
     for preset in presets:
         file_name = f"{hentai_title} {preset['name']}[hstream.moe].mkv"
@@ -78,8 +76,8 @@ def encode_downloads(
         mux_out = os.path.join('2-Out', folder_name, 'Muxed', file_name)
 
         if os.path.exists(mux_out):
-            print(f'Skipped {preset['h']}p AV1 Encode')
-            return
+            print(f'Skipped {preset['h']}p x265 Encode')
+            continue
 
         _encode_video(preset, source_video, tmp_out, hentai_title, input_aspect)
         _remux_video(tmp_out, mux_out)

utils/encode_stream.py

@@ -69,12 +69,11 @@ def _encode_720p_fallback(
     ]
 
     try:
-        subprocess.run(cmd, shell=True, check=True)
+        subprocess.run(cmd, check=True)
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)
 
-
 def _change_chunk_extension(
     preset: dict[str, str],
     cdn_folder: str,
@@ -141,36 +140,36 @@ def _encode(
         "-map", "1:a:0", # Audio from Source
         "-c:v", preset['encoder'],
         "-preset", preset['preset'],
-        "-crf", preset['crf'],
+        "-crf", str(preset['crf']),
         "-pix_fmt", "yuv420p", # 8bit to increase decode performance
         "-vf", f"scale={preset['w']}:{preset['h']},setsar=1:1",
         "-aspect", aspect_ratio,
     ]
 
     if preset["encoder"] == "libx264":
-        cmd += ["-x264-params", f"keyint=24:min-keyint=24:scenecut=0"]
-        cmd += ["-c:a", "aac", "-b:a", "128k"]
+        cmd += ["-x264-params", "keyint=24:min-keyint=24:scenecut=0"]
+        cmd += ["-c:a", "aac", "-b:a", "160k"]
     elif preset["encoder"] == "libsvtav1":
-        cmd += ["-svtav1-params", f"keyint={keyframe_interval}s,fast-decode=1,tune=0"]
-        cmd += ["-c:a", "libopus", "-b:a", "128k"]
-    
+        cmd += ["-svtav1-params", f"keyint={keyframe_interval}s:fast-decode=1:tune=1"]
+        cmd += ["-c:a", "aac", "-b:a", "160k"]
+
+    output_path = os.path.join(cdn_folder, preset['out_folder'], 'manifest.mpd')
+
     cmd += [
         "-ac", "2",
         "-sn", # No subtitles
         "-map_metadata", "-1", # Get rid of metadata which might be incorrect
         "-use_template", "1", # Don't list every segment url, use template instead
         "-use_timeline", "1", # Make sure segment timing is always correct
-        "-init_seg_name", "chunks/init-stream$RepresentationID$.webm", # Init segment
-        "-media_seg_name", "chunks/chunk-stream$RepresentationID$-$Number%05d$.webm", # Media segments
-        "-seg_duration", str(segment_duration), # DASH segment duration
-        "-f", "dash", 
-        os.path.join(cdn_folder, preset['out_folder'], 'manifest.mpd')
+        "-init_seg_name", "chunks/init-stream$RepresentationID$.webm",
+        "-media_seg_name", "chunks/chunk-stream$RepresentationID$-$Number%05d$.webm",
+        "-seg_duration", str(segment_duration),
+        "-f", "dash",
+        output_path
     ]
 
-    print(cmd)
-
     try:
-        subprocess.run(cmd, shell=True, check=True)
+        subprocess.run(cmd, check=True)
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)
@@ -185,14 +184,14 @@ def encode_streams(
 ):
     presets = [
         {"name": "720p",    "w": "1280", "h": "720",  "encoder": "libx264",   "preset": "medium", "crf": "22", "input_video": upscaled_video,     "out_folder": '720'},
-        {"name": "1080p",   "w": "1920", "h": "1080", "encoder": "libsvtav1", "preset": "6",      "crf": "26", "input_video": upscaled_video,     "out_folder": '1080'},
-        {"name": "1080p48", "w": "1920", "h": "1080", "encoder": "libsvtav1", "preset": "6",      "crf": "26", "input_video": interpolated_video, "out_folder": '1080i'},
-        {"name": "2160",    "w": "3840", "h": "2160", "encoder": "libsvtav1", "preset": "6",      "crf": "28", "input_video": upscaled_video,     "out_folder": '2160'},
+        {"name": "1080p",   "w": "1920", "h": "1080", "encoder": "libsvtav1", "preset": "6",      "crf": "28", "input_video": upscaled_video,     "out_folder": '1080'},
+        {"name": "1080p48", "w": "1920", "h": "1080", "encoder": "libsvtav1", "preset": "6",      "crf": "28", "input_video": interpolated_video, "out_folder": '1080i'},
+        {"name": "2160",    "w": "3840", "h": "2160", "encoder": "libsvtav1", "preset": "6",      "crf": "32", "input_video": upscaled_video,     "out_folder": '2160'},
     ]
 
     # Optional UHD Interpolate encode
     if interpolated_uhd_video is not None:
-        presets.append({"name": "2160p48", "w": "3840", "h": "2160", "encoder": "libsvtav1", "preset": "6", "crf": "28", "input_video": interpolated_uhd_video, "out_folder": '2160i'})
+        presets.append({"name": "2160p48", "w": "3840", "h": "2160", "encoder": "libsvtav1", "preset": "6", "crf": "32", "input_video": interpolated_uhd_video, "out_folder": '2160i'})
 
     for preset in presets:
         # Skip already encoded streams

utils/interpolate.py

@@ -40,20 +40,43 @@ def _interpolate(
     vapoursynth_file: str,
     interpolate_output: str,
 ):
-    cmd = [
-        "vspipe", 
-        "-c", "y4m",
-        vapoursynth_file,
-        "-", "|",
-        "ffmpeg", "-v", "quiet", "-stats",
-        "-i", "-",
-        "-c:v", "hevc_nvenc",
-        "-qp", "5",
-        interpolate_output
-    ]
+    print('Started Interpolation')
 
     try:
-        subprocess.run(cmd, shell=True, check=True)
+        # First process (vspipe)
+        vspipe = subprocess.Popen(
+            [
+                "vspipe",
+                "-c", "y4m",
+                vapoursynth_file,
+                "-"
+            ],
+            stdout=subprocess.PIPE
+        )
+
+        # Second process (ffmpeg), reading from vspipe
+        ffmpeg = subprocess.Popen(
+            [
+                "ffmpeg",
+                "-v", "quiet", "-stats",
+                "-f", "yuv4mpegpipe",
+                "-i", "-",
+                "-c:v", "hevc_nvenc",
+                "-qp", "5",
+                interpolate_output
+            ],
+            stdin=vspipe.stdout
+        )
+
+        # Important: allow vspipe to receive SIGPIPE if ffmpeg exits
+        vspipe.stdout.close()
+
+        ffmpeg.wait()
+        vspipe.wait()
+
+        if ffmpeg.returncode != 0:
+            raise subprocess.CalledProcessError(ffmpeg.returncode, "ffmpeg")
+    
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)

utils/mediainfo.py

@@ -7,6 +7,12 @@ def get_aspect_ratio(video_input: str) -> str:
     print('Detected Aspect Ratio : ' + aspect_ratio[0])
     return aspect_ratio[0]
 
+def get_video_resolution(video_input: str) -> tuple[int, int]:
+    media_info = MediaInfo.parse(video_input)
+    video_track = media_info.video_tracks[0]
+    print('Detected Resolution   : ' + str(video_track.width) + 'x' + str(video_track.height))
+    return (video_track.width, video_track.height)
+
 def get_framerate(video_input: str) -> str:
     media_info = MediaInfo.parse(video_input)
     video_track = media_info.video_tracks[0]

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, 
@@ -20,54 +19,85 @@ def _re_encode(
     :type input_aspect: str
     """
 
+    fps = get_framerate(source_video)
+    resolution = get_video_resolution(source_video)
+    
+    scale = "720:480"
+
+    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",
         "-i", source_video,
         "-c:v", "ffv1",
         "-level", "3",
-        "-vf", f"fps={get_framerate(source_video)},scale=-1:\'min({MAX_INPUT_WIDTH},ih)\'",
+        "-vf", vf_filter,
         "-aspect", input_aspect,
         "-pix_fmt", "yuv420p",
         "-color_primaries", "1",
         "-color_trc", "1",
         "-colorspace", "1",
-        "-an", 
+        "-an",
         "-sn",
         "-map_metadata", "-1",
         temp_out_video
     ]
 
     try:
-        subprocess.run(cmd, shell=True, check=True)
+        subprocess.run(cmd, check=True)
     except subprocess.CalledProcessError as e:
         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')
 
-    cmd = [
-        "vspipe", 
-        "-c", "y4m",
-        vapoursynth_script,
-        "-", # Video output to pipe
-        "|", # Pipe
-        "ffmpeg", "-v", "quiet", "-stats",
-        "-f", "yuv4mpegpipe",
-        "-i", "-", # Pipe Video Input
-        "-c:v", "hevc_nvenc",
-        "-qp", "5",
-        "-aspect", input_aspect,
-        upscale_output
-    ]
-
     try:
-        subprocess.run(cmd, shell=True, check=True)
+        # First process (vspipe)
+        vspipe = subprocess.Popen(
+            [
+                "vspipe",
+                "-c", "y4m",
+                vapoursynth_script,
+                "-"
+            ],
+            stdout=subprocess.PIPE
+        )
+
+        # Second process (ffmpeg), reading from vspipe
+        ffmpeg = subprocess.Popen(
+            [
+                "ffmpeg",
+                "-v", "quiet", "-stats",
+                "-f", "yuv4mpegpipe",
+                "-i", "-",
+                "-c:v", "hevc_nvenc",
+                "-qp", "5",
+                upscale_output
+            ],
+            stdin=vspipe.stdout
+        )
+
+        # Important: allow vspipe to receive SIGPIPE if ffmpeg exits
+        vspipe.stdout.close()
+
+        ffmpeg.wait()
+        vspipe.wait()
+
+        if ffmpeg.returncode != 0:
+            raise subprocess.CalledProcessError(ffmpeg.returncode, "ffmpeg")
+
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)
@@ -85,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)