From 685648957f903d19b51d4ec8cde4237ea9b64892 Mon Sep 17 00:00:00 2001 From: medram Date: Sun, 20 Sep 2020 21:34:20 +0100 Subject: [PATCH] Update waifu2x_ncnn_vulkan arguments to the latest version! --- src/video2x.yaml | 7 ++++--- src/wrappers/waifu2x_ncnn_vulkan.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/video2x.yaml b/src/video2x.yaml index cde8788..2e66712 100644 --- a/src/video2x.yaml +++ b/src/video2x.yaml @@ -55,15 +55,16 @@ waifu2x_converter_cpp: waifu2x_ncnn_vulkan: path: '%LOCALAPPDATA%\video2x\waifu2x-ncnn-vulkan\waifu2x-ncnn-vulkan' v: null # verbose output - #i: null # input-path: input image path (jpg/png) or directory - #o: null # output-path: output image path (png) or directory + #i: null # input-path: input image path (jpg/png/webp) or directory + #o: null # output-path: output image path (jpg/png/webp) or directory 'n': 2 # noise-level: denoise level (-1/0/1/2/3, default=0) s: 2 # scale: upscale ratio (1/2, default=2) t: 400 # tile-size: tile size (>=32, default=400) m: null # model-path: waifu2x model path (default=models-cunet) g: 0 # gpu-id: gpu device to use (default=0) - j: '1:2:2' # thread count for load/proc/save (default=1:2:2) + j: '1:2:2' # thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu x: false # enable tta mode + f: png # output image format (jpg/png/webp, default=ext/png) srmd_ncnn_vulkan: path: '%LOCALAPPDATA%\video2x\srmd-ncnn-vulkan\srmd-ncnn-vulkan' v: null # verbose output diff --git a/src/wrappers/waifu2x_ncnn_vulkan.py b/src/wrappers/waifu2x_ncnn_vulkan.py index 0d72789..f5da9f3 100755 --- a/src/wrappers/waifu2x_ncnn_vulkan.py +++ b/src/wrappers/waifu2x_ncnn_vulkan.py @@ -44,8 +44,8 @@ class WrapperMain: parser.error = lambda message: (_ for _ in ()).throw(AttributeError(message)) parser.add_argument('--help', action='help', help='show this help message and exit') parser.add_argument('-v', action='store_true', help='verbose output') - parser.add_argument('-i', type=str, help=argparse.SUPPRESS) # help='input image path (jpg/png) or directory') - parser.add_argument('-o', type=str, help=argparse.SUPPRESS) # help='output image path (png) or directory') + parser.add_argument('-i', type=str, help=argparse.SUPPRESS) # help='input image path (jpg/png/webp) or directory') + parser.add_argument('-o', type=str, help=argparse.SUPPRESS) # help='output image path (jpg/png/webp) or directory') parser.add_argument('-n', type=int, choices=range(-1, 4), help='denoise level') parser.add_argument('-s', type=int, help='upscale ratio') parser.add_argument('-t', type=int, help='tile size (>=32)') @@ -53,6 +53,7 @@ class WrapperMain: parser.add_argument('-g', type=int, help='gpu device to use') parser.add_argument('-j', type=str, help='thread count for load/proc/save') parser.add_argument('-x', action='store_true', help='enable tta mode') + parser.add_argument('-f', type=str, help='output image format (jpg/png/webp, default=ext/png)') return parser.parse_args(arguments) def load_configurations(self, upscaler):