Fix running out of vram on linux

utils/encode_downloads.py

@@ -21,33 +21,36 @@ def _encode_video(
     hentai_title: str, 
     input_aspect: str = "16:9"
 ):
-    print(f"Encoding {preset['h']}p AV1")
+    print(f'Encoding {preset['h']}p AV1')
 
     cmd = [
         "ffmpeg", "-v", "quiet", "-stats",
-        "-i", preset['input_video'],
+        "-i", f'"{preset['input_video']}"',
-        "-i", source_video,
+        "-i", f'"{source_video}"',
         "-map", "0:v:0", # Video from upscale or interpolated file
         "-map", "1:a:0", # Audio from source video
         "-map", "1:s:0", # Subtitle from source 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]",
+        "-metadata", f'Title=\"{hentai_title} [hstream.moe]\"',
         "-c:v", "libsvtav1",
         "-crf", preset['crf'],
         "-preset", "4",
-        "-pix_fmt", "yuv420p10le",
+        "-pix_fmt", "yuv420p10le", # 10bit
-        "-vf", f"scale=min({preset['w']}\\,iw):-2,setsar=1:1",
+        "-vf", f"\"scale=\'min({preset['w']},iw)\':-2,setsar=1:1\"",
         "-aspect", input_aspect,
         "-c:a", "libopus",
         "-b:a", "160k",
         "-c:s", "copy",
-        output_video
+        f'"{output_video}"'
     ]
 
+    if sys.platform == 'linux':
+        cmd = ' '.join(cmd)
+
     try:
-        subprocess.run(cmd, check=True)
+        subprocess.run(cmd, shell=True, check=True)
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)
@@ -62,13 +65,13 @@ def encode_downloads(
     input_aspect: str = "16:9"
 ):
     presets = [
-        {"w": "1920", "h": "1080", "crf": "24", "name": "[1080p-AV1]",        "input_video": upscaled_video},
+        {"w": "1920", "h": "1080", "crf": "22", "name": "[1080p-AV1]",        "input_video": upscaled_video},
-        {"w": "1920", "h": "1080", "crf": "24", "name": "[1080p-AV1][48fps]", "input_video": interpolated_video},
+        {"w": "1920", "h": "1080", "crf": "22", "name": "[1080p-AV1][48fps]", "input_video": interpolated_video},
-        {"w": "3840", "h": "2160", "crf": "26", "name": "[2160p-AV1]",        "input_video": upscaled_video},
+        {"w": "3840", "h": "2160", "crf": "24", "name": "[2160p-AV1]",        "input_video": upscaled_video},
     ]
 
     if interpolated_uhd_video is not None:
-        presets.append({"w": "3840", "h": "2160", "crf": "26", "name": "[2160p-AV1][48fps]", "input_video": interpolated_uhd_video})
+        presets.append({"w": "3840", "h": "2160", "crf": "24", "name": "[2160p-AV1][48fps]", "input_video": interpolated_uhd_video})
 
     for preset in presets:
         file_name = f"{hentai_title} {preset['name']}[hstream.moe].mkv"
@@ -77,7 +80,7 @@ def encode_downloads(
 
         if os.path.exists(mux_out):
             print(f'Skipped {preset['h']}p AV1 Encode')
-            continue
+            return
 
         _encode_video(preset, source_video, tmp_out, hentai_title, input_aspect)
         _remux_video(tmp_out, mux_out)

utils/encode_stream.py

@@ -52,8 +52,8 @@ def _encode_720p_fallback(
     
     cmd = [
         "ffmpeg", "-v", "quiet", "-stats",
-        "-i", upscale_output,
+        "-i", f'"{upscale_output}"',
-        "-i", video_source,
+        "-i", f'"{video_source}"',
         "-map", "0:v:0",
         "-map", "1:a:0",
         "-c:v", "libx264",
@@ -65,15 +65,19 @@ def _encode_720p_fallback(
         "-sn",
         "-map_metadata", "-1",
         "-movflags", "+faststart",
-        output
+        f'"{output}"'
     ]
 
+    if sys.platform == 'linux':
+        cmd = ' '.join(cmd)
+
     try:
-        subprocess.run(cmd, check=True)
+        subprocess.run(cmd, shell=True, 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,
@@ -134,26 +138,31 @@ def _encode(
 
     cmd = [
         "ffmpeg", "-v", "quiet", "-stats",
-        "-i", preset['input_video'],
+        "-i", f'"{preset['input_video']}"',
-        "-i", source_video,
+        "-i", f'"{source_video}"',
         "-map", "0:v:0", # Video from Upscale
         "-map", "1:a:0", # Audio from Source
         "-c:v", preset['encoder'],
         "-preset", preset['preset'],
-        "-crf", str(preset['crf']),
+        "-crf", 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", "keyint=24:min-keyint=24:scenecut=0"]
+        cmd += ["-x264-params", f"keyint=24:min-keyint=24:scenecut=0"]
-        cmd += ["-c:a", "aac", "-b:a", "160k"]
+        cmd += ["-c:a", "aac", "-b:a", "128k"]
     elif preset["encoder"] == "libsvtav1":
-        cmd += ["-svtav1-params", f"keyint={keyframe_interval}s:fast-decode=1:tune=1"]
+        cmd += ["-svtav1-params", f"keyint={keyframe_interval}s,fast-decode=1,tune=0"]
-        cmd += ["-c:a", "aac", "-b:a", "160k"]
+        cmd += ["-c:a", "libopus", "-b:a", "128k"]
 
-    output_path = 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"
+
+    if sys.platform == 'linux':
+        init_seg_name = "chunks/init-stream\$RepresentationID\$.webm"
+        media_seg_name = "chunks/chunk-stream\$RepresentationID\$-\$Number%05d\$.webm"
     
     cmd += [
         "-ac", "2",
@@ -161,15 +170,18 @@ def _encode(
         "-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_seg_name", init_seg_name, # Init segment
-        "-media_seg_name", "chunks/chunk-stream$RepresentationID$-$Number%05d$.webm",
+        "-media_seg_name", media_seg_name, # Media segments
-        "-seg_duration", str(segment_duration),
+        "-seg_duration", str(segment_duration), # DASH segment duration
         "-f", "dash", 
-        output_path
+        f'"{os.path.join(cdn_folder, preset['out_folder'], 'manifest.mpd')}"'
     ]
 
+    if sys.platform == 'linux':
+        cmd = ' '.join(cmd)
+
     try:
-        subprocess.run(cmd, check=True)
+        subprocess.run(cmd, shell=True, check=True)
     except subprocess.CalledProcessError as e:
         print(f"\nffmpeg failed with error code {e.returncode}", file=sys.stderr)
         sys.exit(e.returncode)

utils/interpolate.py

@@ -26,6 +26,9 @@ def _create_vsrife_script(
         script = [
             'import vapoursynth as vs',
             'from vsrife import rife',
+            # this isn't a real fix, as this SHOULDN'T FIX IT
+            # however for some reason it does
+            'vs.core.max_cache_size=8192',
             f'clip = vs.core.ffms2.Source(source="./{hentai_name} [4k][HEVC].mkv")',
             f'clip = vs.core.resize.Bicubic(clip, width={video_width}, height=2160, format=vs.RGBS, matrix_in_s="709")',
             'clip = rife(clip=clip, model="4.25.lite", factor_num=2, factor_den=1)',
@@ -40,43 +43,23 @@ def _interpolate(
     vapoursynth_file: str,
     interpolate_output: str,
 ):
-    print('Started Interpolation')
+    cmd = [
+        "vspipe", 
+        "-c", "y4m",
+        f'"{vapoursynth_file}"',
+        "-", "|",
+        "ffmpeg", "-v", "quiet", "-stats",
+        "-i", "-",
+        "-c:v", "hevc_nvenc",
+        "-qp", "5",
+        f'"{interpolate_output}"'
+    ]
+
+    if sys.platform == 'linux':
+        cmd = ' '.join(cmd)
 
     try:
-        # First process (vspipe)
+        subprocess.run(cmd, shell=True, check=True)
-        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/upcale.py

@@ -20,16 +20,12 @@ def _re_encode(
     :type input_aspect: str
     """
 
-    fps = get_framerate(source_video)
-
-    vf_filter = f"fps={fps},scale=-1:min({MAX_INPUT_WIDTH}\\,ih)"
-
     cmd = [
         "ffmpeg", "-v", "quiet", "-stats",
-        "-i", source_video,
+        "-i", f'"{source_video}"',
         "-c:v", "ffv1",
         "-level", "3",
-        "-vf", vf_filter,
+        "-vf", f"\"fps={get_framerate(source_video)},scale=-1:\'min({MAX_INPUT_WIDTH},ih)\'\"",
         "-aspect", input_aspect,
         "-pix_fmt", "yuv420p",
         "-color_primaries", "1",
@@ -38,11 +34,14 @@ def _re_encode(
         "-an", 
         "-sn",
         "-map_metadata", "-1",
-        temp_out_video
+        f'"{temp_out_video}"'
     ]
 
+    if sys.platform == 'linux':
+        cmd = ' '.join(cmd)
+
     try:
-        subprocess.run(cmd, check=True)
+        subprocess.run(cmd, shell=True, 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)
@@ -55,42 +54,26 @@ def _upscale(
 
     vapoursynth_script = os.path.join('utils', 'vs-realesrgan.vpy')
 
+    cmd = [
+        "vspipe", 
+        "-c", "y4m",
+        f"\"{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,
+        f"\"{upscale_output}\""
+    ]
+
+    if sys.platform == 'linux':
+        cmd = ' '.join(cmd)
+
     try:
-        # First process (vspipe)
+        subprocess.run(cmd, shell=True, check=True)
-        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",
-                "-aspect", input_aspect,
-                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)