diff --git a/src/video2x.yaml b/src/video2x.yaml index 4463102..a2eebbe 100644 --- a/src/video2x.yaml +++ b/src/video2x.yaml @@ -1,7 +1,7 @@ # Name: Video2X Configuration File # Creator: K4YT3X # Date Created: October 23, 2018 -# Last Modified: May 29, 2020 +# Last Modified: June 7, 2020 # Values here are the default values. Change the value here to # save the default value permanently. # Items commented out are parameters irrelevant to this context @@ -100,11 +100,12 @@ anime4kcpp: fastMode: false # Faster but maybe low quality videoMode: false # Video process preview: null # Preview image - preprocessing: False # Enable pre processing - postprocessing: False # Enable post processing + preprocessing: false # Enable pre processing + postprocessing: false # Enable post processing preFilters: 4 # Enhancement filter, only working when preProcessing is true,there are 5 options by binary:Median blur=0000001, Mean blur=0000010, CAS Sharpening=0000100, Gaussian blur weak=0001000, Gaussian blur=0010000, Bilateral filter=0100000, Bilateral filter faster=1000000, you can freely combine them, eg: Gaussian blur weak + Bilateral filter = 0001000 | 0100000 = 0101000 = 40(D) (unsigned int [=4]) postFilters: 40 # Enhancement filter, only working when postProcessing is true,there are 5 options by binary:Median blur=0000001, Mean blur=0000010, CAS Sharpening=0000100, Gaussian blur weak=0001000, Gaussian blur=0010000, Bilateral filter=0100000, Bilateral filter faster=1000000, you can freely combine them, eg: Gaussian blur weak + Bilateral filter = 0001000 | 0100000 = 0101000 = 40(D), so you can put 40 to enable Gaussian blur weak and Bilateral filter, which also is what I recommend for image that < 1080P, 48 for image that >= 1080P, and for performance I recommend to use 72 for video that < 1080P, 80 for video that >=1080P (unsigned int [=40]) - GPUMode: False # Enable GPU acceleration + GPUMode: false # Enable GPU acceleration + CNNMode: false # Enable ACNet listGPUs: null # list GPUs platformID: 0 # Specify the platform ID (unsigned int [=0]) deviceID: 0 # Specify the device ID (unsigned int [=0]) diff --git a/src/video2x_gui.py b/src/video2x_gui.py index 3408bf3..672bd57 100755 --- a/src/video2x_gui.py +++ b/src/video2x_gui.py @@ -34,7 +34,7 @@ from PyQt5.QtGui import * from PyQt5.QtWidgets import * import magic -GUI_VERSION = '2.6.0' +GUI_VERSION = '2.7.0' LEGAL_INFO = f'''Video2X GUI Version: {GUI_VERSION}\\ Upscaler Version: {UPSCALER_VERSION}\\ @@ -385,6 +385,7 @@ class Video2XMainWindow(QMainWindow): self.anime4kcpp_pre_processing_check_box = self.findChild(QCheckBox, 'anime4kCppPreProcessingCheckBox') self.anime4kcpp_post_processing_check_box = self.findChild(QCheckBox, 'anime4kCppPostProcessingCheckBox') self.anime4kcpp_gpu_mode_check_box = self.findChild(QCheckBox, 'anime4kCppGpuModeCheckBox') + self.anime4kcpp_cnn_mode_check_box = self.findChild(QCheckBox, 'anime4kCppCnnModeCheckBox') # FFmpeg settings # global options @@ -542,6 +543,7 @@ class Video2XMainWindow(QMainWindow): self.anime4kcpp_pre_processing_check_box.setChecked(settings['preprocessing']) self.anime4kcpp_post_processing_check_box.setChecked(settings['postprocessing']) self.anime4kcpp_gpu_mode_check_box.setChecked(settings['GPUMode']) + self.anime4kcpp_cnn_mode_check_box.setChecked(settings['CNNMode']) # ffmpeg # global options @@ -650,6 +652,7 @@ class Video2XMainWindow(QMainWindow): self.config['anime4kcpp']['preprocessing'] = bool(self.anime4kcpp_pre_processing_check_box.isChecked()) self.config['anime4kcpp']['postprocessing'] = bool(self.anime4kcpp_post_processing_check_box.isChecked()) self.config['anime4kcpp']['GPUMode'] = bool(self.anime4kcpp_gpu_mode_check_box.isChecked()) + self.config['anime4kcpp']['CNNMode'] = bool(self.anime4kcpp_cnn_mode_check_box.isChecked()) # ffmpeg self.config['ffmpeg']['ffmpeg_path'] = os.path.expandvars(self.ffmpeg_path_line_edit.text()) diff --git a/src/video2x_gui.pyproject.user b/src/video2x_gui.pyproject.user index 0c97afa..e87e316 100644 --- a/src/video2x_gui.pyproject.user +++ b/src/video2x_gui.pyproject.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/src/video2x_gui.ui b/src/video2x_gui.ui index 272450c..ec6c551 100644 --- a/src/video2x_gui.ui +++ b/src/video2x_gui.ui @@ -1685,6 +1685,13 @@ + + + + CNN Mode + + + diff --git a/src/wrappers/anime4kcpp.py b/src/wrappers/anime4kcpp.py index e435fab..d35815d 100755 --- a/src/wrappers/anime4kcpp.py +++ b/src/wrappers/anime4kcpp.py @@ -59,6 +59,7 @@ class WrapperMain: parser.add_argument('-r', '--preFilters', type=int, help='Enhancement filter, only working when preProcessing is true,there are 5 options by binary:Median blur=0000001, Mean blur=0000010, CAS Sharpening=0000100, Gaussian blur weak=0001000, Gaussian blur=0010000, Bilateral filter=0100000, Bilateral filter faster=1000000, you can freely combine them, eg: Gaussian blur weak + Bilateral filter = 0001000 | 0100000 = 0101000 = 40(D)') parser.add_argument('-e', '--postFilters', type=int, help='Enhancement filter, only working when postProcessing is true,there are 5 options by binary:Median blur=0000001, Mean blur=0000010, CAS Sharpening=0000100, Gaussian blur weak=0001000, Gaussian blur=0010000, Bilateral filter=0100000, Bilateral filter faster=1000000, you can freely combine them, eg: Gaussian blur weak + Bilateral filter = 0001000 | 0100000 = 0101000 = 40(D), so you can put 40 to enable Gaussian blur weak and Bilateral filter, which also is what I recommend for image that < 1080P, 48 for image that >= 1080P, and for performance I recommend to use 72 for video that < 1080P, 80 for video that >=1080P') parser.add_argument('-q', '--GPUMode', action='store_true', help='Enable GPU acceleration') + parser.add_argument('-w', '--CNNMode', action='store_true', help='Enable ACNet') parser.add_argument('-l', '--listGPUs', action='store_true', help='list GPUs') parser.add_argument('-h', '--platformID', type=int, help='Specify the platform ID') parser.add_argument('-d', '--deviceID', type=int, help='Specify the device ID')