From 7500ee4d6a8a8fea9144213655e8f9b285f11a10 Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Wed, 16 Dec 2020 11:44:43 +0100 Subject: [PATCH] Cache tile size for video upscaling (joey's) --- Code/Main/MainForm.cs | 1 + Code/OS/ESRGAN.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Code/Main/MainForm.cs b/Code/Main/MainForm.cs index 02a44da..e334444 100644 --- a/Code/Main/MainForm.cs +++ b/Code/Main/MainForm.cs @@ -377,6 +377,7 @@ private async void upscaleBtn_Click(object sender, EventArgs e) if (Config.GetBool("reloadImageBeforeUpscale")) ReloadImage(); UpdateResizeMode(); + ESRGAN.cacheTiling = (htTabControl.SelectedIndex == 2); if (htTabControl.SelectedIndex == 0) await PreviewUI.UpscaleImage(); if (htTabControl.SelectedIndex == 1) await BatchUpscaleUI.Run(preprocessMode.SelectedIndex == 0); if (htTabControl.SelectedIndex == 2) await VideoUpscaleUI.Run(videoPreprocessMode.SelectedIndex == 0); diff --git a/Code/OS/ESRGAN.cs b/Code/OS/ESRGAN.cs index f3435ab..1282a1f 100644 --- a/Code/OS/ESRGAN.cs +++ b/Code/OS/ESRGAN.cs @@ -20,7 +20,8 @@ namespace Cupscale.OS internal class ESRGAN { public enum PreviewMode { None, Cutout, FullImage } - public enum Backend { CUDA, CPU, NCNN } + public enum Backend { CUDA, CPU, NCNN }; + public static bool cacheTiling = false; public static async Task DoUpscale(string inpath, string outpath, ModelData mdl, string tilesize, bool alpha, PreviewMode mode, Backend backend, bool showTileProgress = true) { @@ -198,8 +199,7 @@ public static async Task RunJoey(string inpath, string outpath, string modelArg, string alphaStr = alpha ? $"--alpha_mode {Config.GetInt("joeyAlphaMode")}" : "--alpha_mode 0"; - string deviceStr = ""; - if (Config.Get("cudaFallback").GetInt() == 1 || Config.Get("cudaFallback").GetInt() == 2) deviceStr = "--cpu"; + string deviceStr = (Config.Get("cudaFallback").GetInt() == 1 || Config.Get("cudaFallback").GetInt() == 2) ? "--cpu" : ""; string seamStr = "--seamless "; switch (Config.Get("seamlessMode").GetInt()) @@ -210,10 +210,12 @@ public static async Task RunJoey(string inpath, string outpath, string modelArg, case 4: seamStr += "alpha_pad"; break; } + string cacheStr = cacheTiling ? "--cache_max_split_depth" : ""; + string opt = stayOpen ? "/K" : "/C"; string cmd = $"{opt} cd /D {Paths.esrganPath.Wrap()} & "; - cmd += $"{EmbeddedPython.GetPyCmd()} upscale.py --input {inpath} --output {outpath} {deviceStr} {seamStr} {alphaStr} {modelArg}".TrimWhitespaces(); + cmd += $"{EmbeddedPython.GetPyCmd()} upscale.py --input {inpath} --output {outpath} {cacheStr} {deviceStr} {seamStr} {alphaStr} {modelArg}".TrimWhitespaces(); Logger.Log("[CMD] " + cmd); Process esrganProcess = OSUtils.NewProcess(!showWindow);