From cb35b3b9ffc64df3751b292ca288b7ae55dfd247 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Thu, 25 May 2023 15:17:57 +0200 Subject: [PATCH] fix errors --- bin/engines/ss/ss.py | 5 +++-- imagevideoupscaler-cli.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/engines/ss/ss.py b/bin/engines/ss/ss.py index b90963e..fe5d7f3 100644 --- a/bin/engines/ss/ss.py +++ b/bin/engines/ss/ss.py @@ -24,6 +24,7 @@ class Scaler: print( '\n\n==>Photo upscaled' ); def videoScaler ( self, tmppath, threads, scalefactor, sharpening, filetype, mode ): + modes = { 'av3':'realesr-animevideov3', 'x4plus': 'realesrgan-x4plus-anime' } print( '\n\n==> Preparing to upscale videos <==\n\n==> You will see a lot of numbers flying by showing the progress of the upscaling of each individual image.\n==> This process might take a long time, depending on the length of the video.\n\n') time.sleep( 2 ); @@ -32,7 +33,7 @@ class Scaler: except FileExistsError: pass if ( self.os_type == 'win32' ): - self.command = f'realesrgan-ncnn-vulkan -i {tmppath} -o {tmppath}sc -s {scalefactor} -j {threads}:{threads}:{threads} -n {mode}' + self.command = f'realesrgan-ncnn-vulkan -i {tmppath} -o {tmppath}sc -s {scalefactor} -j {threads}:{threads}:{threads} -n {modes[ mode ]}' elif ( self.os_type == 'linux' ): - self.command = f'wine ./bin/lib/realesrgan-ncnn-vulkan.exe -i {tmppath} -o {tmppath}sc -s {scalefactor} -j {threads}:{threads}:{threads} -n {mode}' + self.command = f'wine ./bin/lib/realesrgan-ncnn-vulkan.exe -i {tmppath} -o {tmppath}sc -s {scalefactor} -j {threads}:{threads}:{threads} -n {modes[ mode ]}' os.system( self.command ); \ No newline at end of file diff --git a/imagevideoupscaler-cli.py b/imagevideoupscaler-cli.py index d5556c6..1f2e929 100644 --- a/imagevideoupscaler-cli.py +++ b/imagevideoupscaler-cli.py @@ -50,7 +50,7 @@ def performChecks ( args, ap ): return False # Check scalefactor argument and also verify that engine supports upscaling - if ( args.scalefactor != None ): + if ( args.scalefactor != None and args.scalefactor != 0 ): if ( int( args.scalefactor ) > 4 and int( args.scalefactor ) < -4 ): print( '\n==> ERROR: Invalid scale factor. Value has to be an integer between -4 and 4' ) return False @@ -60,7 +60,7 @@ def performChecks ( args, ap ): return False # Check sharpening argument and also verify that engine supports it - if ( args.sharpening != None ): + if ( args.sharpening != None and args.sharpening != 0 ): if ( float( args.sharpening ) >= 1 and float( args.sharpening ) <= 0 ): print( '\n==> ERROR: Invalid value for sharpening. Value has to be between 0 and 1' ) return False