updated GUI screenshot

.gitignore

@@ -1,9 +1,3 @@
-# Runtime files
-upscaled/
-frames/
-waifu2x-caffe/
-testvid.mp4
-
 # PyCharm
 .idea/
 
@@ -57,8 +51,8 @@ coverage.xml
 .pytest_cache/
 
 # Translations
-*.mo
+#*.mo
-*.pot
+#*.pot
 
 # Django stuff:
 *.log

README.md

@@ -1,3 +1,7 @@
+<p align="center">
+   <img src="https://user-images.githubusercontent.com/21986859/81489504-c7d1f780-9265-11ea-86c8-cc0316e2082d.png"/>
+</p>
+
 ![Master Branch Version](https://img.shields.io/badge/master-v4.0.0-9cf?style=flat-square)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/k4yt3x/video2x?style=flat-square)
 ![GitHub All Releases](https://img.shields.io/github/downloads/k4yt3x/video2x/total?style=flat-square)
@@ -5,35 +9,160 @@
 ![Platforms](https://img.shields.io/badge/Platforms-Windows%20%7C%20Linux%20%7C%20macOS-blue?style=flat-square)
 <img alt="Become a Patron!"
 src="https://c5.patreon.com/external/logo/become_a_patron_button@2x.png"
-href="https://www.patreon.com/bePatron?u=34970782" 
+href="https://www.patreon.com/bePatron?u=34970782"
 height=20 />
 
-# Video2X Lossless Video Enlarger
+<!--# Video2X Lossless Video Enlarger-->
 
 ### Official Discussion Group (Telegram): https://t.me/video2x
 
-## Download Builds (Windows)
+## [Download Builds](https://github.com/k4yt3x/video2x/releases) (Windows)
 
-You can go to the [releases page](https://github.com/k4yt3x/video2x/releases) to download the latest builds of `Video2X`. The exe files will require no Python or Python module installation.
+You can go to the [releases page](https://github.com/k4yt3x/video2x/releases) to download the latest builds of Video2X. The exe files will require no Python or Python module installation. There are two editions available.
 
-The **`full`** package provides all packages that will possibly be needed by `Video2X`, including `FFmpeg`, `waifu2x-caffe`, `waifu2x-converter-cpp`, `waifu2x-ncnn-vulkan`, `srmd-ncnn-vulkan` and `Anime4KCPP`. The config file (`video2x.yaml`) is also already configured for the environment. All you need to do is just to launch `video2x.exe`.
+- **`Full`**: full package comes pre-configured with **all** dependencies like `FFmpeg` and `waifu2x-caffe`.
+- **`Light`**: ligt package comes with only Video2X binaries and a template configuration file. The user will either have to run the setup script or install and configure dependencies themselves.
 
-The **`light`** package provides only the most basic functions of `Video2X`. Only `video2x.exe`, `video2x_setup.exe` and `video2x.yaml` are included. To setup dependencies (e.g. `FFmpeg` and `Waifu2X`) automatically, simply launch `video2x_setup.exe`.
+Go to the [Quick Start](#quick-start) section for usages.
 
-## Prerequisites
+## Introduction
 
-Component names that are **bolded** can be automatically downloaded and configured with the `video2x_setup.py` script.
+Video2X is a video upscaling software based on Waifu2X, Anime4K and SRMD written in Python 3. It upscales videos and restores details from low-resolution videos. Below is a side-by-side preview.
 
-1. Operating System: Windows / Linux
+![Spirited Away Demo](https://user-images.githubusercontent.com/21986859/49412428-65083280-f73a-11e8-8237-bb34158a545e.png)
-2. AMD GPU / Nvidia GPU
+
-3. AMD GPU driver / Nvidia GPU driver / Nvidia CUDNN
+*Upscale Comparison Demonstration*
-4. [**FFmpeg**](https://ffmpeg.zeranoe.com/builds/)
+
-5. One of the following drivers
+**You can watch the whole demo video on YouTube: https://youtu.be/mGEfasQl2Zo**
-   - [**waifu2x-caffe**](https://github.com/lltcggie/waifu2x-caffe/releases)
+
-   - [**waifu2x-converter-cpp**](https://github.com/DeadSix27/waifu2x-converter-cpp/releases)
+Clip is from trailer of animated movie "千と千尋の神隠し". Copyright belongs to "株式会社スタジオジブリ (STUDIO GHIBLI INC.)". Will delete immediately if use of clip is in violation of copyright.
-   - [**waifu2x-ncnn-vulkan**](https://github.com/nihui/waifu2x-ncnn-vulkan)
+
-   - [**srmd-ncnn-vulkan**](https://github.com/nihui/srmd-ncnn-vulkan)
+## Demo Videos
-   - [**Anime4KCPP**](https://github.com/TianZerL/Anime4KCPP)
+
+Below is a list of all the demo videos available.
+
+- **Spirited Away (360P to 4K)**
+  - Original name: 千と千尋の神隠し
+  - YouTube: https://youtu.be/mGEfasQl2Zo
+  - Bilibili: https://www.bilibili.com/video/BV1V5411471i/
+- **The Pet Girl of Sakurasou 240P to 1080P 60FPS**
+  - Original name: さくら荘のペットな彼女
+  - YouTube: https://youtu.be/M0vDI1HH2_Y
+  - Bilibili: https://www.bilibili.com/video/BV14k4y167KP/
+
+## Screenshots
+
+### Video2X GUI
+
+![GUI Preview](https://user-images.githubusercontent.com/21986859/81546668-3bf5c380-936a-11ea-9583-c969ea0d862b.png)
+
+*Video2X GUI Screenshot*
+
+### Video2X CLI
+
+![Video2X CLI Screenshot](https://user-images.githubusercontent.com/21986859/81039711-4fe88380-8e99-11ea-9846-175f72100a76.png)
+
+*Video2X CLI Screenshot*
+
+---
+
+## Documentations
+
+### [Video2X Wiki](https://github.com/k4yt3x/video2x/wiki)
+
+You can find all detailed user-facing and developer-facing documentations in the [Video2X Wiki](https://github.com/k4yt3x/video2x/wiki). It covers everything from step-by-step instructions for beginners, to the code structure of this program for advanced users and developers. If this README page doesn't answer all your questions, the wiki page is where you should head to.
+
+### [Run From Source](https://github.com/k4yt3x/video2x/wiki/Run-From-Source)
+
+Instructions for how to run this program from source code.
+
+### [Step-By-Step Tutorial](https://github.com/k4yt3x/video2x/wiki/Step-By-Step-Tutorial)
+
+For those who want a detailed walk-through of how to use Video2X, you can head to the [Step-By-Step Tutorial](https://github.com/k4yt3x/video2x/wiki/Step-By-Step-Tutorial) wiki page. It includes almost every step you need to perform in order to enlarge your first video.
+
+### [Drivers](https://github.com/k4yt3x/video2x/wiki/Drivers)
+
+Go to the [Drivers](https://github.com/k4yt3x/video2x/wiki/Drivers) wiki page if you want to see a detailed description on the different types of drivers implemented by Video2X. This wiki page contains detailed difference between different drivers, and how to download and set each of them up for Video2X.
+
+### [Q&A](https://github.com/k4yt3x/video2x/wiki/Q&A)
+
+If you have any questions, first try visiting our [Q&A](https://github.com/k4yt3x/video2x/wiki/Q&A) page to see if your question is answered there. If not, open an issue and we will respond to your questions ASAP. Alternatively, you can also join our [Telegram discussion group](https://t.me/video2x) and ask your questions there.
+
+---
+
+### Sample Videos
+
+If you can't find a video clip to begin with, or if you want to see a before-after comparison, we have prepared some sample clips for you. The quick start guide down below will also be based on the name of the sample clips.
+
+![sample_video](https://user-images.githubusercontent.com/21986859/52905766-d5512b00-3236-11e9-9aea-077636539679.png)
+
+*Sample Upscale Videos*
+
+- [Sample Video (240P) 4.54MB](https://files.k4yt3x.com/Resources/Videos/sample_input.mp4)
+- [Sample Video Upscaled (1080P) 4.54MB](https://files.k4yt3x.com/Resources/Videos/sample_output.mp4)
+- [Sample Video Original (1080P) 22.2MB](https://files.k4yt3x.com/Resources/Videos/sample_original.mp4)
+
+Clip is from anime "さくら荘のペットな彼女". Copyright belongs to "株式会社アニプレックス (Aniplex Inc.)". Will delete immediately if use of clip is in violation of copyright.
+
+---
+
+## Quick Start
+
+### Prerequisites
+
+Before running Video2X, you'll need to ensure you have installed the drivers' external dependencies such as GPU drivers.
+
+- waifu2x-caffe
+  - GPU mode: Nvidia graphics card driver
+  - cuDNN mode: Nvidia CUDA and [cuDNN](https://docs.nvidia.com/deeplearning/sdk/cudnn-install/index.html#install-windows)
+- Other Drivers
+  - GPU driver if you want to use GPU for processing
+
+### Running Video2X (GUI)
+
+The easiest way to run Video2X is to use the full build. Extract the full release zip file and you'll get these files.
+
+![Video2X Release Files](https://user-images.githubusercontent.com/21986859/81489846-28633380-926a-11ea-9e81-fb92f492e14c.png)
+
+Simply double click on video2x_gui.exe to launch the GUI.
+
+![Video2X GUI Main Tab](https://user-images.githubusercontent.com/21986859/81489858-4c267980-926a-11ea-9ab2-38ec738f2fb6.png)
+
+Then, drag the videos you wish to upscale into the window and select the appropriate output path.
+
+![drag-drop](https://user-images.githubusercontent.com/21986859/81489880-7bd58180-926a-11ea-85ae-b72d2f4f5e72.png)
+
+Tweak the settings if you want to, then hit the start button at the bottom and the upscale will start. Now you'll just have to wait for it to complete.
+
+![upscale-started](https://user-images.githubusercontent.com/21986859/81489924-ce16a280-926a-11ea-831c-6c66b950f957.png)
+
+### Running Video2X (CLI)
+
+#### Basic Upscale Example
+
+This example command below uses `waifu2x-caffe` to enlarge the video `sample-input.mp4` two double its original size.
+
+```shell
+python video2x.py -i sample-input.mp4 -o sample-output.mp4 -r 2 -d waifu2x_caffe
+```
+
+#### Advanced Upscale Example
+
+If you would like to tweak engine-specific settings, either specify the corresponding argument after `--`, or edit the corresponding field in the configuration file `video2x.yaml`. **Command line arguments will overwrite default values in the config file.**
+
+This example below adds enables TTA for `waifu2x-caffe`.
+
+```shell
+python video2x.py -i sample-input.mp4 -o sample-output.mp4 -r 2 -d waifu2x_caffe -- --tta 1
+```
+
+To see a help page for driver-specific settings, use `-d` to select the driver and append `-- --help` as demonstrated below. This will print all driver-specific settings and descriptions.
+
+```shell
+python video2x.py -d waifu2x_caffe -- --help
+```
+
+---
 
 ## Recent Changes
 
@@ -62,131 +191,6 @@ Component names that are **bolded** can be automatically downloaded and configur
 
 - Added support for Anime4KCPP
 
-## Description
-
-Video2X is an automation software based on waifu2x image enlarging engine. It extracts frames from a video, enlarge it by a number of times without losing any details or quality, keeping lines smooth and edges sharp.
-
-For short: **Video2X enlarges your video without losing details**.
-
-Watch for the sharper edges in this screenshot around the shadows:
-
-![preview](https://user-images.githubusercontent.com/21986859/49412428-65083280-f73a-11e8-8237-bb34158a545e.png)
-
-**You can also watch the YouTube video Demo: https://www.youtube.com/watch?v=PG94iPoeoZk**
-
-Clip is from trailer of animated movie "千と千尋の神隠し". Copyright belongs to "株式会社スタジオジブリ (STUDIO GHIBLI INC.)". Will delete immediately if use of clip is in violation of copyright.
-
-## Screenshots
-
-### Video2X GUI
-
-![Video2X GUI Screenshot](https://user-images.githubusercontent.com/21986859/81157039-19346b00-8f76-11ea-965f-4d7edf6a818e.png)
-
-### Video2X CLI
-
-![Video2X CLI Screenshot](https://user-images.githubusercontent.com/21986859/81039711-4fe88380-8e99-11ea-9846-175f72100a76.png)
-
----
-
-## Documentations
-
-### [Video2X Wiki](https://github.com/k4yt3x/video2x/wiki)
-
-You can find all detailed user-facing and developer-facing documentations in the [Video2X Wiki](https://github.com/k4yt3x/video2x/wiki). It covers everything from step-by-step instructions for beginners, to the code structure of this program for advanced users and developers. If this README page doesn't answer all your questions, the wiki page is where you should head to.
-
-### [Step-By-Step Tutorial](https://github.com/k4yt3x/video2x/wiki/Step-By-Step-Tutorial)
-
-For those who want a detailed walk-through of how to use `Video2X`, you can head to the [Step-By-Step Tutorial](https://github.com/k4yt3x/video2x/wiki/Step-By-Step-Tutorial) wiki page. It includes almost every step you need to perform in order to enlarge your first video.
-
-### [Drivers](https://github.com/k4yt3x/video2x/wiki/Drivers)
-
-Go to the [Drivers](https://github.com/k4yt3x/video2x/wiki/Drivers) wiki page if you want to see a detailed description on the different types of drivers implemented by `Video2X`. This wiki page contains detailed difference between different drivers, and how to download and set each of them up for `Video2X`.
-
-### [Q&A](https://github.com/k4yt3x/video2x/wiki/Q&A)
-
-If you have any questions, first try visiting our [Q&A](https://github.com/k4yt3x/video2x/wiki/Q&A) page to see if your question is answered there. If not, open an issue and we will respond to your questions ASAP.
-
----
-
-## Quick Start
-
-### Prerequisites
-
-- **Python 3.8**
-Download: https://www.python.org/downloads/windows/
-- **FFmpeg Windows Build**
-Download: https://ffmpeg.org/download.html
-- **waifu2x-caffe** (designed for Nvidia CUDA/cuDNN)
-Download: https://github.com/lltcggie/waifu2x-caffe/releases
-- **waifu2x-converter-cpp**
-Download: https://github.com/DeadSix27/waifu2x-converter-cpp/releases
-- **waifu2x-ncnn-vulkan**
-Download: https://github.com/nihui/waifu2x-ncnn-vulkan/releases
-- **Anime4KCPP**
-Download: https://github.com/TianZerL/Anime4KCPP/releases
-- **srmd-ncnn-vulkan**
-Download: https://github.com/nihui/srmd-ncnn-vulkan/releases
-
-### Installing Dependencies
-
-First, clone the video2x repository.
-
-```shell
-git clone https://github.com/k4yt3x/video2x.git
-cd video2x/src
-```
-
-Then you may run the `video2x_setup.py` script to install and configure the dependencies automatically. This script is designed and tested on Windows 10.
-
-This script will install the newest version of `ffmpeg`, and all upscaling drivers to `%LOCALAPPDATA%\\video2x` and all required python libraries.
-
-```shell
-python video2x_setup.py
-```
-
-Alternatively, you can also install the dependencies manually. Please refer to the prerequisites section to see what's needed.
-
-Then you'll need to install python dependencies before start using video2x. Install simply by executing the following command.
-
-```shell
-pip install -r requirements.txt
-```
-
-### Sample Videos
-
-If you can't find a video clip to begin with, or if you want to see a before-after comparison, we have prepared some sample clips for you. The quick start guide down below will also be based on the name of the sample clips.
-
-![sample_video](https://user-images.githubusercontent.com/21986859/52905766-d5512b00-3236-11e9-9aea-077636539679.png)
-
-- [Sample Video Original (240P) 1.7MB](https://files.k4yt3x.com/Resources/Videos/sample_input.mp4)
-- [Sample Video Upscaled (1080P) 4.8MB](https://files.k4yt3x.com/Resources/Videos/sample_output.mp4)
-
-Clip is from anime "さくら荘のペットな彼女". Copyright belongs to "株式会社アニプレックス (Aniplex Inc.)". Will delete immediately if use of clip is in violation of copyright.
-
-### Basic Upscale Example
-
-This example command below uses `waifu2x-caffe` to enlarge the video `sample-input.mp4` two double its original size.
-
-```shell
-python video2x.py -i sample-input.mp4 -o sample-output.mp4 -r 2 -d waifu2x_caffe
-```
-
-### Advanced Upscale Example
-
-If you would like to tweak engine-specific settings, either specify the corresponding argument after `--`, or edit the corresponding field in the configuration file `video2x.yaml`. **Command line arguments will overwrite default values in the config file.**
-
-This example below adds enables TTA for `waifu2x-caffe`.
-
-```shell
-python video2x.py -i sample-input.mp4 -o sample-output.mp4 -r 2 -d waifu2x_caffe -- --tta 1
-```
-
-To see a help page for driver-specific settings, use `-d` to select the driver and append `-- --help` as demonstrated below. This will print all driver-specific settings and descriptions.
-
-```shell
-python video2x.py -d waifu2x_caffe -- --help
-```
-
 ---
 
 # Full Usage
@@ -205,9 +209,17 @@ python video2x.py -d waifu2x_caffe -- --help
 ### -c CONFIG, --config CONFIG
     video2x config file path
 
-### -d {waifu2x_caffe,waifu2x_converter_cpp,waifu2x_ncnn_vulkan,srmd_ncnn_vulkan,anime4kcpp}, --driver {waifu2x_caffe,waifu2x_converter_cpp,waifu2x_ncnn_vulkan,srmd_ncnn_vulkan,anime4kcpp}
+### -d DRIVER, --driver DRIVER
     upscaling driver (default: waifu2x_caffe)
 
+Available options are:
+
+- waifu2x_caffe
+- waifu2x_converter_cpp
+- waifu2x_ncnn_vulkan
+- srmd_ncnn_vulkan
+- anime4kcpp
+
 ### -p PROCESSES, --processes PROCESSES
     number of processes to use for upscaling (default: 1)
 

src/build.ps1

@@ -2,7 +2,7 @@
 Name: Video2X Build Script
 Creator: K4YT3X
 Date Created: May 6, 2020
-Last Modified: May 6, 2020
+Last Modified: May 7, 2020
 
 Description: A PowerShell script that will build Video2X
 executable (PE) releases automatically using PyInstaller.
@@ -12,12 +12,18 @@ To start a PowerShell session with execution policy bypass
 powershell –ExecutionPolicy Bypass
 #>
 
+if ($args.count -ne 1){
+    Write-Host -ForegroundColor White "Usage:`n .\build.ps1 VIDEO2X_VERSION"
+    Exit
+}
+
 # version number
-$SCRIPT_VERSION = "1.0.0"
+$SCRIPT_VERSION = "1.0.1"
-$VIDEO2X_VERSION = "4.0.0"
+$VIDEO2X_VERSION = $args[0]
 
 Write-Host -ForegroundColor White "Video2X Building Script Version $($SCRIPT_VERSION)
-Starting to build Video2X release packages"
+Starting to build Video2X release packages
+Building Video2X release $($VIDEO2X_VERSION)"
 
 # build Video2X CLI
 Write-Host -ForegroundColor White "`nBuilding Video2X CLI"
@@ -46,33 +52,33 @@ pyinstaller --noconfirm --log-level=WARN `
     video2x_setup.py
 
 # remove old builds if found
-if (Test-Path "video2x-builds" -PathType any) {
+if (Test-Path "$($VIDEO2X_VERSION)" -PathType any) {
-    Remove-Item -path "video2x-builds" -recurse
+    Remove-Item -path "$($VIDEO2X_VERSION)" -recurse
 }
 
 # create build directory
-New-Item "video2x-builds" -ItemType Directory
+New-Item "$($VIDEO2X_VERSION)" -ItemType Directory
 
 # copy files into corresponding builds
 # full edition
 Write-Host -ForegroundColor White "`nCreating full package"
-New-Item "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-full" -ItemType Directory
+New-Item "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-full" -ItemType Directory
-Copy-Item "dist\video2x.exe" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-full\"
+Copy-Item "dist\video2x.exe" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-full\"
-Copy-Item "dist\video2x_gui.exe" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-full\"
+Copy-Item "dist\video2x_gui.exe" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-full\"
-Copy-Item -Path "$env:LOCALAPPDATA\video2x" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-full\dependencies" -Recurse
+Copy-Item -Path "$env:LOCALAPPDATA\video2x" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-full\dependencies" -Recurse
 
 # overwrite paths to relative paths
-(Get-Content "video2x.yaml").replace("C:\Users\K4YT3X\AppData\Local\video2x\", "dependencies\") | Set-Content "video2x.yaml.relative"
+(Get-Content "video2x.yaml").replace("%LOCALAPPDATA%\video2x", "dependencies") | Set-Content "video2x.yaml.relative"
-Move-Item "video2x.yaml.relative" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-full\video2x.yaml"
+Move-Item "video2x.yaml.relative" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-full\video2x.yaml"
 
 # light edition
 Write-Host -ForegroundColor White "`nCreating light package"
-New-Item "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-light" -ItemType Directory
+New-Item "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-light" -ItemType Directory
-Copy-Item "dist\video2x.exe" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-light\"
+Copy-Item "dist\video2x.exe" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-light\"
-Copy-Item "dist\video2x_gui.exe" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-light\"
+Copy-Item "dist\video2x_gui.exe" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-light\"
-Copy-Item "dist\video2x_setup.exe" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-light\"
+Copy-Item "dist\video2x_setup.exe" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-light\"
-Copy-Item "video2x.yaml" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-light\"
+Copy-Item "video2x.yaml" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-light\"
-Copy-Item "requirements.txt" -Destination "video2x-builds\video2x-$($VIDEO2X_VERSION)-win32-light\"
+Copy-Item "requirements.txt" -Destination "$($VIDEO2X_VERSION)\video2x-$($VIDEO2X_VERSION)-win32-light\"
 
 # clean up temporary files
 Write-Host -ForegroundColor White "`nDeleting temporary files"

src/locale/zh_CN/LC_MESSAGES/zh_CN.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-05-04 19:14-0400\n"
+"POT-Creation-Date: 2020-05-11 04:39-0400\n"
-"PO-Revision-Date: 2020-05-04 19:16-0400\n"
+"PO-Revision-Date: 2020-05-11 04:40-0400\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -14,114 +14,190 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 2.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: upscaler.py:85
+#: progress_monitor.py:42
-msgid "Extracted frames are being saved to: {}"
-msgstr "提取的帧将被保存到：{}"
-
-#: upscaler.py:87
-msgid "Upscaled frames are being saved to: {}"
-msgstr "已放大的帧将被保存到：{}"
-
-#: upscaler.py:97
-msgid "Cleaning up cache directory: {}"
-msgstr "清理缓存目录：{}"
-
-#: upscaler.py:100
-msgid "Unable to delete: {}"
-msgstr "无法删除：{}"
-
-#: upscaler.py:107
-msgid "You must specify input video file/directory path"
-msgstr "您必须指定输入视频文件/目录路径"
-
-#: upscaler.py:110
-msgid "You must specify output video file/directory path"
-msgstr "您必须指定输出视频文件/目录路径"
-
-#: upscaler.py:113
-msgid "Selected driver accepts only scaling ratio"
-msgstr "所选驱动程序仅接受缩放比率"
-
-#: upscaler.py:116
-msgid "Scaling ratio must be 1 or 2 for waifu2x_ncnn_vulkan"
-msgstr "waifu2x_ncnn_vulkan 的缩放比必须为 1 或 2"
-
-#: upscaler.py:119
-msgid "Scaling ratio must be one of 2, 3 or 4 for srmd_ncnn_vulkan"
-msgstr "srmd_ncnn_vulkan 的缩放比必须为 2、3 或 4"
-
-#: upscaler.py:122
-msgid "You can only specify either scaling ratio or output width and height"
-msgstr "您只能指定缩放比或输出宽度和高度两者之一"
-
-#: upscaler.py:125
-msgid "You must specify both width and height"
-msgstr "您必须同时指定宽度和高度"
-
-#: upscaler.py:142
 msgid "Upscaling Progress"
 msgstr "放大进度"
 
-#: upscaler.py:179
+#: upscaler.py:104
+msgid "Specified or default cache directory is a file/link"
+msgstr "指定或默认的缓存目录是文件/链接"
+
+#: upscaler.py:110
+msgid "Creating cache directory {}"
+msgstr "创建缓存目录 {}"
+
+#: upscaler.py:113
+msgid "Unable to create {}"
+msgstr "无法创建 {}"
+
+#: upscaler.py:118
+msgid "Extracted frames are being saved to: {}"
+msgstr "提取的帧将被保存到：{}"
+
+#: upscaler.py:120
+msgid "Upscaled frames are being saved to: {}"
+msgstr "已放大的帧将被保存到：{}"
+
+#: upscaler.py:130
+msgid "Cleaning up cache directory: {}"
+msgstr "清理缓存目录：{}"
+
+#: upscaler.py:133
+msgid "Unable to delete: {}"
+msgstr "无法删除：{}"
+
+#: upscaler.py:139 upscaler.py:154 upscaler.py:165
+msgid "Input and output path type mismatch"
+msgstr "输入和输出路径类型不匹配"
+
+#: upscaler.py:140
+msgid "Input is multiple files but output is not directory"
+msgstr "输入是多个文件，但输出不是目录"
+
+#: upscaler.py:144
+msgid "Input path {} is neither a file nor a directory"
+msgstr "输入路径 {} 既不是文件也不是目录"
+
+#: upscaler.py:148 upscaler.py:170
+msgid "Input directory and output directory cannot be the same"
+msgstr "输入目录和输出目录不能相同"
+
+#: upscaler.py:155
+msgid "Input is single file but output is directory"
+msgstr "所选的输入路径是单个文件，但输出路径是目录"
+
+#: upscaler.py:158
+msgid "No suffix found in output file path"
+msgstr "在输出文件路径中未找到后缀"
+
+#: upscaler.py:159
+msgid "Suffix must be specified for FFmpeg"
+msgstr "必须为 FFmpeg 指定后缀"
+
+#: upscaler.py:166
+msgid "Input is directory but output is existing single file"
+msgstr "输入是目录，但输出是现有的单个文件"
+
+#: upscaler.py:175
+msgid "Input path is neither a file nor a directory"
+msgstr "输入路径既不是文件也不是目录"
+
+#: upscaler.py:184
+msgid "FFmpeg or FFprobe cannot be found under the specified path"
+msgstr "在指定的路径下找不到 FFmpeg 或 FFprobe"
+
+#: upscaler.py:185 upscaler.py:195
+msgid "Please check the configuration file settings"
+msgstr "请检查配置文件设置"
+
+#: upscaler.py:194
+msgid "Specified driver executable directory doesn't exist"
+msgstr "指定驱动的可执行文件不存在"
+
+#: upscaler.py:221
+msgid "Failed to parse driver argument: {}"
+msgstr "解析驱动程序参数失败：{}"
+
+#: upscaler.py:253
 msgid "Unrecognized driver: {}"
 msgstr "无法识别的驱动名称：{}"
 
-#: upscaler.py:258
+#: upscaler.py:293
+msgid "Starting progress monitor"
+msgstr "启动进度监视器"
+
+#: upscaler.py:298
 msgid "Starting upscaled image cleaner"
 msgstr "启动已放大图像清理程序"
 
-#: upscaler.py:264
+#: upscaler.py:307 upscaler.py:324
-msgid "Main process waiting for subprocesses to exit"
+msgid "Killing progress monitor"
-msgstr "主进程开始等待子进程结束"
+msgstr "终结进度监视器"
 
-#: upscaler.py:266
+#: upscaler.py:310 upscaler.py:327
-msgid "Subprocess {} exited with code {}"
-msgstr "子进程 {} 结束，返回码 {}"
-
-#: upscaler.py:274 upscaler.py:287
 msgid "Killing upscaled image cleaner"
 msgstr "终结已放大图像清理程序"
 
-#: upscaler.py:313 upscaler.py:368
+#: upscaler.py:331
+msgid "Terminating all processes"
+msgstr "正在终止所有进程"
+
+#: upscaler.py:338
+msgid "Main process waiting for subprocesses to exit"
+msgstr "主进程开始等待子进程结束"
+
+#: upscaler.py:357 upscaler.py:361
+msgid "Subprocess {} exited with code {}"
+msgstr "子进程 {} 结束，返回码 {}"
+
+#: upscaler.py:367
+msgid "Stop signal received"
+msgstr "收到停止信号"
+
+#: upscaler.py:372
+msgid "Subprocess execution ran into an error"
+msgstr "子进程执行遇到错误"
+
+#: upscaler.py:421
+msgid "Upscaling single video file: {}"
+msgstr "放大单个视频文件：{}"
+
+#: upscaler.py:443 upscaler.py:502
 msgid "Starting to upscale extracted images"
 msgstr "开始对提取的帧进行放大"
 
-#: upscaler.py:316 upscaler.py:370
+#: upscaler.py:448 upscaler.py:504
 msgid "Upscaling completed"
 msgstr "放大完成"
 
-#: upscaler.py:324
+#: upscaler.py:457
 msgid "Reading video information"
 msgstr "读取视频信息"
 
-#: upscaler.py:338
+#: upscaler.py:471
 msgid "Aborting: No video stream found"
 msgstr "程序中止：文件中未找到视频流"
 
-#: upscaler.py:355
+#: upscaler.py:490
 msgid "Unsupported pixel format: {}"
 msgstr "不支持的像素格式：{}"
 
-#: upscaler.py:358
+#: upscaler.py:493
 msgid "Framerate: {}"
 msgstr "帧率：{}"
 
-#: upscaler.py:373
+#: upscaler.py:507
 msgid "Converting extracted frames into video"
-msgstr "将提取的帧转换为视频"
+msgstr "正在将提取的帧转换为视频"
 
-#: upscaler.py:377
+#: upscaler.py:514
 msgid "Conversion completed"
 msgstr "转换已完成"
 
-#: upscaler.py:380
+#: upscaler.py:518
-msgid "Migrating audio tracks and subtitles to upscaled video"
+msgid "Migrating audio, subtitles and other streams to upscaled video"
-msgstr "将音轨和字幕迁移到放大后的视频"
+msgstr "正在将音频、字幕和其他流迁移到放大后的视频"
 
-#: video2x.py:87
+#: upscaler.py:527
+msgid "Failed to migrate streams"
+msgstr "迁移流失败"
+
+#: upscaler.py:528
+msgid "Trying to output video without additional streams"
+msgstr "正在尝试输出不含其他流的视频"
+
+#: upscaler.py:535
+msgid "Output video file exists, aborting"
+msgstr "输出目标文件已存在，取消输出"
+
+#: upscaler.py:539
+msgid "Writing intermediate file to: {}"
+msgstr "正在将中间视频文件写入至：{}"
+
+#: video2x.py:84
 msgid ""
 "Video2X Version: {}\n"
 "Author: K4YT3X\n"
@@ -135,110 +211,88 @@ msgstr ""
 "GitHub 主页：https://github.com/k4yt3x/video2x\n"
 "联系方式：k4yt3x@k4yt3x.com"
 
-#: video2x.py:109
+#: video2x.py:106
-msgid "General Options"
+msgid "Video2X Options"
-msgstr "通用选项"
+msgstr "Video2X 选项"
 
-#: video2x.py:110
+#: video2x.py:107
 msgid "show this help message and exit"
 msgstr "显示此帮助消息并退出"
 
-#: video2x.py:111
+#: video2x.py:108
 msgid "source video file/directory"
 msgstr "源视频文件/目录"
 
-#: video2x.py:112
+#: video2x.py:109
 msgid "output video file/directory"
 msgstr "输出视频文件/目录"
 
-#: video2x.py:113
+#: video2x.py:110
 msgid "video2x config file path"
 msgstr "video2x 配置文件路径"
 
-#: video2x.py:115
+#: video2x.py:112
-msgid "upscaling driver"
-msgstr "视频放大驱动"
-
-#: video2x.py:116
-msgid "number of processes to use for upscaling"
-msgstr "并发进程数"
-
-#: video2x.py:117
 msgid "display version, lawful information and exit"
 msgstr "显示版本和法律信息并退出"
 
-#: video2x.py:120
+#: video2x.py:115
-msgid "Scaling Options"
+msgid "Upscaling Options"
-msgstr "缩放选项"
+msgstr "视频放大选项"
 
-#: video2x.py:121
+#: video2x.py:116
-msgid "output video width"
+msgid "upscaling driver"
-msgstr "输出视频宽度"
+msgstr "视频放大驱动"
 
-#: video2x.py:122
+#: video2x.py:117
-msgid "output video height"
-msgstr "输出视频高度"
-
-#: video2x.py:123
 msgid "scaling ratio"
 msgstr "缩放比"
 
-#: video2x.py:163
+#: video2x.py:118
+msgid "number of processes to use for upscaling"
+msgstr "并发进程数"
+
+#: video2x.py:119
+msgid "preserve extracted and upscaled frames"
+msgstr "保留提取的和放大的帧"
+
+#: video2x.py:159
 msgid "This file cannot be imported"
 msgstr "此文件无法被当作模块导入"
 
-#: video2x.py:193
+#: video2x.py:229
-msgid "Specified driver executable directory doesn't exist"
-msgstr "指定驱动的可执行文件不存在"
-
-#: video2x.py:194
-msgid "Please check the configuration file settings"
-msgstr "请检查配置文件设置"
-
-#: video2x.py:211
-msgid "Specified cache directory is a file/link"
-msgstr "指定的缓存目录是文件/链接"
-
-#: video2x.py:218
-msgid "Creating cache directory {}"
-msgstr "创建缓存目录 {}"
-
-#: video2x.py:224
-msgid "Unable to create {}"
-msgstr "无法创建 {}"
-
-#: video2x.py:237
-msgid "Upscaling single video file: {}"
-msgstr "放大单个视频文件：{}"
-
-#: video2x.py:241
-msgid "Input and output path type mismatch"
-msgstr "输入和输出路径类型不匹配"
-
-#: video2x.py:242
-msgid "Input is single file but output is directory"
-msgstr "所选的输入路径是单个文件，但输出路径是目录"
-
-#: video2x.py:245
-msgid "No suffix found in output file path"
-msgstr "在输出文件路径中未找到后缀"
-
-#: video2x.py:246
-msgid "Suffix must be specified for FFmpeg"
-msgstr "必须为 FFmpeg 指定后缀"
-
-#: video2x.py:270
-msgid "Upscaling videos in directory: {}"
-msgstr "放大该文件夹中的所有视频：{}"
-
-#: video2x.py:295
-msgid "Input path is neither a file nor a directory"
-msgstr "输入路径既不是文件也不是目录"
-
-#: video2x.py:298
 msgid "Program completed, taking {} seconds"
 msgstr "程序执行完毕，总计花费 {} 秒"
 
-#: video2x.py:301
+#: video2x.py:232
 msgid "An exception has occurred"
 msgstr "发生了异常"
+
+#~ msgid "output video width"
+#~ msgstr "输出视频宽度"
+
+#~ msgid "output video height"
+#~ msgstr "输出视频高度"
+
+#~ msgid "You must specify input video file/directory path"
+#~ msgstr "您必须指定输入视频文件/目录路径"
+
+#~ msgid "You must specify output video file/directory path"
+#~ msgstr "您必须指定输出视频文件/目录路径"
+
+#~ msgid "Selected driver accepts only scaling ratio"
+#~ msgstr "所选驱动程序仅接受缩放比率"
+
+#~ msgid "Scaling ratio must be 1 or 2 for waifu2x_ncnn_vulkan"
+#~ msgstr "waifu2x_ncnn_vulkan 的缩放比必须为 1 或 2"
+
+#~ msgid "Scaling ratio must be one of 2, 3 or 4 for srmd_ncnn_vulkan"
+#~ msgstr "srmd_ncnn_vulkan 的缩放比必须为 2、3 或 4"
+
+#~ msgid "You can only specify either scaling ratio or output width and height"
+#~ msgstr "您只能指定缩放比或输出宽度和高度两者之一"
+
+#~ msgid "You must specify both width and height"
+#~ msgstr "您必须同时指定宽度和高度"
+
+#~ msgid "Upscaling videos in directory: {}"
+#~ msgstr "放大该文件夹中的所有视频：{}"

src/progress_monitor.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Name: Video2X Upscale Progress Monitor
+Author: BrianPetkovsek
+Date Created: May 7, 2020
+Last Modified: May 10, 2020
+"""
+
+# built-in imports
+import contextlib
+import threading
+import time
+
+# third-party imports
+from tqdm import tqdm
+
+
+class ProgressMonitor(threading.Thread):
+    """ progress monitor
+
+    This class provides progress monitoring functionalities
+    by keeping track of the amount of frames in the input
+    directory and the output directory. This is originally
+    suggested by @ArmandBernard.
+    """
+
+    def __init__(self, upscaler, extracted_frames_directories):
+        threading.Thread.__init__(self)
+        self.upscaler = upscaler
+        self.extracted_frames_directories = extracted_frames_directories
+        self.running = False
+
+    def run(self):
+        self.running = True
+
+        # get number of extracted frames
+        self.upscaler.total_frames = 0
+        for directory in self.extracted_frames_directories:
+            self.upscaler.total_frames += len([f for f in directory.iterdir() if str(f).lower().endswith(self.upscaler.image_format.lower())])
+
+        with tqdm(total=self.upscaler.total_frames, ascii=True, desc=_('Upscaling Progress')) as progress_bar:
+            # tqdm update method adds the value to the progress
+            # bar instead of setting the value. Therefore, a delta
+            # needs to be calculated.
+            previous_cycle_frames = 0
+            while self.running:
+
+                with contextlib.suppress(FileNotFoundError):
+                    upscaled_frames = [f for f in self.upscaler.upscaled_frames.iterdir() if str(f).lower().endswith(self.upscaler.image_format.lower())]
+                    if len(upscaled_frames) >= 1:
+                        self.upscaler.last_frame_upscaled = sorted(upscaled_frames)[-1]
+                    self.upscaler.total_frames_upscaled = len(upscaled_frames)
+
+                    # update progress bar
+                    delta = self.upscaler.total_frames_upscaled - previous_cycle_frames
+                    previous_cycle_frames = self.upscaler.total_frames_upscaled
+                    progress_bar.update(delta)
+
+                time.sleep(1)
+
+    def stop(self):
+        self.running = False
+        self.join()

src/upscaler.py

@@ -4,7 +4,7 @@
 Name: Video2X Upscaler
 Author: K4YT3X
 Date Created: December 10, 2018
-Last Modified: May 6, 2020
+Last Modified: May 10, 2020
 
 Description: This file contains the Upscaler class. Each
 instance of the Upscaler class is an upscaler on an image or
@@ -14,6 +14,7 @@ a folder.
 # local imports
 from exceptions import *
 from image_cleaner import ImageCleaner
+from progress_monitor import ProgressMonitor
 from wrappers.ffmpeg import Ffmpeg
 
 # built-in imports
@@ -25,17 +26,16 @@ import importlib
 import locale
 import os
 import pathlib
+import queue
 import re
 import shutil
-import sys
+import subprocess
 import tempfile
-import threading
 import time
 import traceback
 
 # third-party imports
 from avalon_framework import Avalon
-from tqdm import tqdm
 
 # internationalization constants
 DOMAIN = 'video2x'
@@ -67,31 +67,52 @@ class Upscaler:
         ArgumentError -- if argument is not valid
     """
 
-    def __init__(self, input_video, output_video, driver_settings, ffmpeg_settings):
+    def __init__(self, input_path, output_path, driver_settings, ffmpeg_settings):
         # mandatory arguments
-        self.input_video = input_video
+        self.input = input_path
-        self.output_video = output_video
+        self.output = output_path
         self.driver_settings = driver_settings
         self.ffmpeg_settings = ffmpeg_settings
 
         # optional arguments
         self.driver = 'waifu2x_caffe'
-        self.scale_width = None
-        self.scale_height = None
         self.scale_ratio = None
         self.processes = 1
         self.video2x_cache_directory = pathlib.Path(tempfile.gettempdir()) / 'video2x'
         self.image_format = 'png'
         self.preserve_frames = False
 
+        # other internal members and signals
+        self.running = False
+        self.total_frames_upscaled = 0
+        self.total_frames = 0
+        self.total_videos = 0
+        self.total_processed = 0
+        self.current_input_video = pathlib.Path()
+        self.last_frame_upscaled = pathlib.Path()
+
     def create_temp_directories(self):
-        """create temporary directory
+        """create temporary directories
         """
 
-        # create a new temp directory if the current one is not found
+        # if cache directory unspecified, use %TEMP%\video2x
-        if not self.video2x_cache_directory.exists():
+        if self.video2x_cache_directory is None:
             self.video2x_cache_directory = pathlib.Path(tempfile.gettempdir()) / 'video2x'
 
+        # if specified cache path exists and isn't a directory
+        if self.video2x_cache_directory.exists() and not self.video2x_cache_directory.is_dir():
+            Avalon.error(_('Specified or default cache directory is a file/link'))
+            raise FileExistsError('Specified or default cache directory is a file/link')
+
+        # if cache directory doesn't exist, try creating it
+        if not self.video2x_cache_directory.exists():
+            try:
+                Avalon.debug_info(_('Creating cache directory {}').format(self.video2x_cache_directory))
+                self.video2x_cache_directory.mkdir(parents=True, exist_ok=True)
+            except Exception as exception:
+                Avalon.error(_('Unable to create {}').format(self.video2x_cache_directory))
+                raise exception
+
         # create temp directories for extracted frames and upscaled frames
         self.extracted_frames = pathlib.Path(tempfile.mkdtemp(dir=self.video2x_cache_directory))
         Avalon.debug_info(_('Extracted frames are being saved to: {}').format(self.extracted_frames))
@@ -113,65 +134,109 @@ class Upscaler:
                     traceback.print_exc()
 
     def _check_arguments(self):
-        # check if arguments are valid / all necessary argument
+        if isinstance(self.input, list):
-        # values are specified
+            if self.output.exists() and not self.output.is_dir():
-        if not self.input_video:
+                Avalon.error(_('Input and output path type mismatch'))
-            Avalon.error(_('You must specify input video file/directory path'))
+                Avalon.error(_('Input is multiple files but output is not directory'))
-            raise ArgumentError('input video path not specified')
+                raise ArgumentError('input output path type mismatch')
-        if not self.output_video:
+            for input_path in self.input:
-            Avalon.error(_('You must specify output video file/directory path'))
+                if not input_path.is_file() and not input_path.is_dir():
-            raise ArgumentError('output video path not specified')
+                    Avalon.error(_('Input path {} is neither a file nor a directory').format(input_path))
-        if (self.driver in ['waifu2x_converter', 'waifu2x_ncnn_vulkan', 'anime4k']) and self.scale_width and self.scale_height:
+                    raise FileNotFoundError(f'{input_path} is neither file nor directory')
-            Avalon.error(_('Selected driver accepts only scaling ratio'))
-            raise ArgumentError('selected driver supports only scaling ratio')
-        if self.driver == 'waifu2x_ncnn_vulkan' and self.scale_ratio is not None and (self.scale_ratio > 2 or not self.scale_ratio.is_integer()):
-            Avalon.error(_('Scaling ratio must be 1 or 2 for waifu2x_ncnn_vulkan'))
-            raise ArgumentError('scaling ratio must be 1 or 2 for waifu2x_ncnn_vulkan')
-        if self.driver == 'srmd_ncnn_vulkan' and self.scale_ratio is not None and (self.scale_ratio not in [2, 3, 4]):
-            Avalon.error(_('Scaling ratio must be one of 2, 3 or 4 for srmd_ncnn_vulkan'))
-            raise ArgumentError('scaling ratio must be one of 2, 3 or 4 for srmd_ncnn_vulkan')
-        if (self.scale_width or self.scale_height) and self.scale_ratio:
-            Avalon.error(_('You can only specify either scaling ratio or output width and height'))
-            raise ArgumentError('both scaling ration and width/height specified')
-        if (self.scale_width and not self.scale_height) or (not self.scale_width and self.scale_height):
-            Avalon.error(_('You must specify both width and height'))
-            raise ArgumentError('only one of width or height is specified')
-
-    def _progress_bar(self, extracted_frames_directories):
-        """ This method prints a progress bar
-
-        This method prints a progress bar by keeping track
-        of the amount of frames in the input directory
-        and the output directory. This is originally
-        suggested by @ArmandBernard.
-        """
-
-        # get number of extracted frames
-        self.total_frames = 0
-        for directory in extracted_frames_directories:
-            self.total_frames += len([f for f in directory.iterdir() if str(f).lower().endswith(self.image_format.lower())])
-
-        with tqdm(total=self.total_frames, ascii=True, desc=_('Upscaling Progress')) as progress_bar:
-
-            # tqdm update method adds the value to the progress
-            # bar instead of setting the value. Therefore, a delta
-            # needs to be calculated.
-            previous_cycle_frames = 0
-            while not self.progress_bar_exit_signal:
-
                 with contextlib.suppress(FileNotFoundError):
-                    self.total_frames_upscaled = len([f for f in self.upscaled_frames.iterdir() if str(f).lower().endswith(self.image_format.lower())])
+                    if input_path.samefile(self.output):
-                    delta = self.total_frames_upscaled - previous_cycle_frames
+                        Avalon.error(_('Input directory and output directory cannot be the same'))
-                    previous_cycle_frames = self.total_frames_upscaled
+                        raise FileExistsError('input directory and output directory are the same')
 
-                    # if upscaling is finished
+        # if input is a file
-                    if self.total_frames_upscaled >= self.total_frames:
+        elif self.input.is_file():
-                        return
+            if self.output.is_dir():
+                Avalon.error(_('Input and output path type mismatch'))
+                Avalon.error(_('Input is single file but output is directory'))
+                raise ArgumentError('input output path type mismatch')
+            if not re.search(r'.*\..*$', str(self.output)):
+                Avalon.error(_('No suffix found in output file path'))
+                Avalon.error(_('Suffix must be specified for FFmpeg'))
+                raise ArgumentError('no output video suffix specified')
 
-                    # adds the delta into the progress bar
+        # if input is a directory
-                    progress_bar.update(delta)
+        elif self.input.is_dir():
+            if self.output.is_file():
+                Avalon.error(_('Input and output path type mismatch'))
+                Avalon.error(_('Input is directory but output is existing single file'))
+                raise ArgumentError('input output path type mismatch')
+            with contextlib.suppress(FileNotFoundError):
+                if self.input.samefile(self.output):
+                    Avalon.error(_('Input directory and output directory cannot be the same'))
+                    raise FileExistsError('input directory and output directory are the same')
 
-                time.sleep(1)
+        # if input is neither
+        else:
+            Avalon.error(_('Input path is neither a file nor a directory'))
+            raise FileNotFoundError(f'{self.input} is neither file nor directory')
+
+        # check FFmpeg settings
+        ffmpeg_path = pathlib.Path(self.ffmpeg_settings['ffmpeg_path'])
+        if not ((pathlib.Path(ffmpeg_path / 'ffmpeg.exe').is_file() and
+                pathlib.Path(ffmpeg_path / 'ffprobe.exe').is_file()) or
+                (pathlib.Path(ffmpeg_path / 'ffmpeg').is_file() and
+                pathlib.Path(ffmpeg_path / 'ffprobe').is_file())):
+            Avalon.error(_('FFmpeg or FFprobe cannot be found under the specified path'))
+            Avalon.error(_('Please check the configuration file settings'))
+            raise FileNotFoundError(self.ffmpeg_settings['ffmpeg_path'])
+
+        # check if driver settings
+        driver_settings = copy.deepcopy(self.driver_settings)
+        driver_path = driver_settings.pop('path')
+
+        # check if driver path exists
+        if not (pathlib.Path(driver_path).is_file() or pathlib.Path(f'{driver_path}.exe').is_file()):
+            Avalon.error(_('Specified driver executable directory doesn\'t exist'))
+            Avalon.error(_('Please check the configuration file settings'))
+            raise FileNotFoundError(driver_path)
+
+        # parse driver arguments using driver's parser
+        # the parser will throw AttributeError if argument doesn't satisfy constraints
+        try:
+            driver_arguments = []
+            for key in driver_settings.keys():
+
+                value = driver_settings[key]
+
+                if value is None or value is False:
+                    continue
+
+                else:
+                    if len(key) == 1:
+                        driver_arguments.append(f'-{key}')
+                    else:
+                        driver_arguments.append(f'--{key}')
+                    # true means key is an option
+                    if value is not True:
+                        driver_arguments.append(str(value))
+
+            DriverWrapperMain = getattr(importlib.import_module(f'wrappers.{self.driver}'), 'WrapperMain')
+            DriverWrapperMain.parse_arguments(driver_arguments)
+        except AttributeError as e:
+            Avalon.error(_('Failed to parse driver argument: {}').format(e.args[0]))
+            raise e
+
+        # waifu2x-caffe scale_ratio, scale_width and scale_height check
+        if self.driver == 'waifu2x_caffe':
+            if (driver_settings['scale_width'] != 0 and driver_settings['scale_height'] == 0 or
+                    driver_settings['scale_width'] == 0 and driver_settings['scale_height'] != 0):
+                Avalon.error('Only one of scale_width and scale_height is specified for waifu2x-caffe')
+                raise AttributeError('only one of scale_width and scale_height is specified for waifu2x-caffe')
+
+            # if scale_width and scale_height are specified, ensure scale_ratio is None
+            elif self.driver_settings['scale_width'] != 0 and self.driver_settings['scale_height'] != 0:
+                self.driver_settings['scale_ratio'] = None
+
+            # if scale_width and scale_height not specified
+            # ensure they are None, not 0
+            else:
+                self.driver_settings['scale_width'] = None
+                self.driver_settings['scale_height'] = None
 
     def _upscale_frames(self):
         """ Upscale video frames with waifu2x-caffe
@@ -183,16 +248,10 @@ class Upscaler:
             w2 {Waifu2x Object} -- initialized waifu2x object
         """
 
-        # progress bar process exit signal
-        self.progress_bar_exit_signal = False
-
         # initialize waifu2x driver
         if self.driver not in AVAILABLE_DRIVERS:
             raise UnrecognizedDriverError(_('Unrecognized driver: {}').format(self.driver))
 
-        # create a container for all upscaler processes
-        upscaler_processes = []
-
         # list all images in the extracted frames
         frames = [(self.extracted_frames / f) for f in self.extracted_frames.iterdir() if f.is_file]
 
@@ -214,7 +273,7 @@ class Upscaler:
             process_directory.mkdir(parents=True, exist_ok=True)
 
         # waifu2x-converter-cpp will perform multi-threading within its own process
-        if self.driver == 'waifu2x_converter_cpp':
+        if self.driver in ['waifu2x_converter_cpp', 'waifu2x_ncnn_vulkan', 'srmd_ncnn_vulkan']:
             process_directories = [self.extracted_frames]
 
         else:
@@ -226,81 +285,93 @@ class Upscaler:
                 # rotate list
                 process_directories = process_directories[-1:] + process_directories[:-1]
 
-        # create threads and start them
+        # create driver processes and start them
         for process_directory in process_directories:
-
+            self.process_pool.append(self.driver_object.upscale(process_directory, self.upscaled_frames))
-            DriverWrapperMain = getattr(importlib.import_module(f'wrappers.{self.driver}'), 'WrapperMain')
-            driver = DriverWrapperMain(copy.deepcopy(self.driver_settings))
-
-            # if the driver being used is waifu2x-caffe
-            if self.driver == 'waifu2x_caffe':
-                upscaler_processes.append(driver.upscale(process_directory,
-                                                         self.upscaled_frames,
-                                                         self.scale_ratio,
-                                                         self.scale_width,
-                                                         self.scale_height,
-                                                         self.image_format,
-                                                         self.bit_depth))
-
-            # if the driver being used is waifu2x-converter-cpp
-            elif self.driver == 'waifu2x_converter_cpp':
-                upscaler_processes.append(driver.upscale(process_directory,
-                                                         self.upscaled_frames,
-                                                         self.scale_ratio,
-                                                         self.processes,
-                                                         self.image_format))
-
-            # if the driver being used is waifu2x-ncnn-vulkan
-            elif self.driver == 'waifu2x_ncnn_vulkan':
-                upscaler_processes.append(driver.upscale(process_directory,
-                                                         self.upscaled_frames,
-                                                         self.scale_ratio))
-
-            # if the driver being used is srmd_ncnn_vulkan
-            elif self.driver == 'srmd_ncnn_vulkan':
-                upscaler_processes.append(driver.upscale(process_directory,
-                                                         self.upscaled_frames,
-                                                         self.scale_ratio))
 
         # start progress bar in a different thread
-        progress_bar = threading.Thread(target=self._progress_bar, args=(process_directories,))
+        Avalon.debug_info(_('Starting progress monitor'))
-        progress_bar.start()
+        self.progress_monitor = ProgressMonitor(self, process_directories)
+        self.progress_monitor.start()
 
         # create the clearer and start it
         Avalon.debug_info(_('Starting upscaled image cleaner'))
-        image_cleaner = ImageCleaner(self.extracted_frames, self.upscaled_frames, len(upscaler_processes))
+        self.image_cleaner = ImageCleaner(self.extracted_frames, self.upscaled_frames, len(self.process_pool))
-        image_cleaner.start()
+        self.image_cleaner.start()
 
         # wait for all process to exit
         try:
-            Avalon.debug_info(_('Main process waiting for subprocesses to exit'))
+            self._wait()
-            for process in upscaler_processes:
+        except (Exception, KeyboardInterrupt, SystemExit) as e:
-                Avalon.debug_info(_('Subprocess {} exited with code {}').format(process.pid, process.wait()))
+            # cleanup
-        except (KeyboardInterrupt, SystemExit):
+            Avalon.debug_info(_('Killing progress monitor'))
-            Avalon.warning('Exit signal received')
+            self.progress_monitor.stop()
-            Avalon.warning('Killing processes')
-            for process in upscaler_processes:
-                process.terminate()
 
-            # cleanup and exit with exit code 1
             Avalon.debug_info(_('Killing upscaled image cleaner'))
-            image_cleaner.stop()
+            self.image_cleaner.stop()
-            self.progress_bar_exit_signal = True
+            raise e
-            sys.exit(1)
 
         # if the driver is waifu2x-converter-cpp
         # images need to be renamed to be recognizable for FFmpeg
         if self.driver == 'waifu2x_converter_cpp':
             for image in [f for f in self.upscaled_frames.iterdir() if f.is_file()]:
-                renamed = re.sub(f'_\\[.*\\]\\[x(\\d+(\\.\\d+)?)\\]\\.{self.image_format}', f'.{self.image_format}', str(image.name))
+                renamed = re.sub(f'_\\[.*\\]\\[x(\\d+(\\.\\d+)?)\\]\\.{self.image_format}',
+                                 f'.{self.image_format}',
+                                 str(image.name))
                 (self.upscaled_frames / image).rename(self.upscaled_frames / renamed)
 
-        # upscaling done, kill the clearer
+        # upscaling done, kill helper threads
-        Avalon.debug_info(_('Killing upscaled image cleaner'))
+        Avalon.debug_info(_('Killing progress monitor'))
-        image_cleaner.stop()
+        self.progress_monitor.stop()
 
-        # pass exit signal to progress bar thread
+        Avalon.debug_info(_('Killing upscaled image cleaner'))
-        self.progress_bar_exit_signal = True
+        self.image_cleaner.stop()
+
+    def _terminate_subprocesses(self):
+        Avalon.warning(_('Terminating all processes'))
+        for process in self.process_pool:
+            process.terminate()
+
+    def _wait(self):
+        """ wait for subprocesses in process pool to complete
+        """
+        Avalon.debug_info(_('Main process waiting for subprocesses to exit'))
+
+        try:
+            # while process pool not empty
+            while self.process_pool:
+
+                # if stop signal received, terminate all processes
+                if self.running is False:
+                    raise SystemExit
+
+                for process in self.process_pool:
+                    process_status = process.poll()
+
+                    # if process finished
+                    if process_status is None:
+                        continue
+
+                    # if return code is not 0
+                    elif process_status != 0:
+                        Avalon.error(_('Subprocess {} exited with code {}').format(process.pid, process_status))
+                        raise subprocess.CalledProcessError(process_status, process.args)
+
+                    else:
+                        Avalon.debug_info(_('Subprocess {} exited with code {}').format(process.pid, process_status))
+                        self.process_pool.remove(process)
+
+                time.sleep(0.1)
+
+        except (KeyboardInterrupt, SystemExit) as e:
+            Avalon.warning(_('Stop signal received'))
+            self._terminate_subprocesses()
+            raise e
+
+        except (Exception, subprocess.CalledProcessError) as e:
+            Avalon.error(_('Subprocess execution ran into an error'))
+            self._terminate_subprocesses()
+            raise e
 
     def run(self):
         """ Main controller for Video2X
@@ -309,93 +380,176 @@ class Upscaler:
         and handles all necessary functions.
         """
 
+        # external stop signal when called in a thread
+        self.running = True
+
+        # define process pool to contain processes
+        self.process_pool = []
+
+        # load driver modules
+        DriverWrapperMain = getattr(importlib.import_module(f'wrappers.{self.driver}'), 'WrapperMain')
+        self.driver_object = DriverWrapperMain(self.driver_settings)
+
+        # load options from upscaler class into driver settings
+        self.driver_object.load_configurations(self)
+
         # parse arguments for waifu2x
         # check argument sanity
         self._check_arguments()
 
-        # convert paths to absolute paths
+        # define processing queue
-        self.input_video = self.input_video.absolute()
+        self.processing_queue = queue.Queue()
-        self.output_video = self.output_video.absolute()
 
-        # drivers that have native support for video processing
+        # if input is a list of files
-        if self.driver == 'anime4kcpp':
+        if isinstance(self.input, list):
-            # append FFmpeg path to the end of PATH
+            # make output directory if it doesn't exist
-            # Anime4KCPP will then use FFmpeg to migrate audio tracks
+            self.output.mkdir(parents=True, exist_ok=True)
-            os.environ['PATH'] += f';{self.ffmpeg_settings["ffmpeg_path"]}'
-            Avalon.info(_('Starting to upscale extracted images'))
 
-            # import and initialize Anime4KCPP wrapper
+            for input_path in self.input:
-            DriverWrapperMain = getattr(importlib.import_module('wrappers.anime4kcpp'), 'WrapperMain')
-            driver = DriverWrapperMain(copy.deepcopy(self.driver_settings))
 
-            # run Anime4KCPP
+                if input_path.is_file():
-            driver.upscale(self.input_video, self.output_video, self.scale_ratio, self.processes).wait()
+                    output_video = self.output / input_path.name
-            Avalon.info(_('Upscaling completed'))
+                    self.processing_queue.put((input_path.absolute(), output_video.absolute()))
 
-        else:
+                elif input_path.is_dir():
-            self.create_temp_directories()
+                    for input_video in [f for f in input_path.iterdir() if f.is_file()]:
+                        output_video = self.output / input_video.name
+                        self.processing_queue.put((input_video.absolute(), output_video.absolute()))
 
-            # initialize objects for ffmpeg and waifu2x-caffe
+        # if input specified is single file
-            fm = Ffmpeg(self.ffmpeg_settings, self.image_format)
+        elif self.input.is_file():
+            Avalon.info(_('Upscaling single video file: {}').format(self.input))
+            self.processing_queue.put((self.input.absolute(), self.output.absolute()))
 
-            Avalon.info(_('Reading video information'))
+        # if input specified is a directory
-            video_info = fm.get_video_info(self.input_video)
+        elif self.input.is_dir():
-            # analyze original video with ffprobe and retrieve framerate
-            # width, height = info['streams'][0]['width'], info['streams'][0]['height']
 
-            # find index of video stream
+            # make output directory if it doesn't exist
-            video_stream_index = None
+            self.output.mkdir(parents=True, exist_ok=True)
-            for stream in video_info['streams']:
+            for input_video in [f for f in self.input.iterdir() if f.is_file()]:
-                if stream['codec_type'] == 'video':
+                output_video = self.output / input_video.name
-                    video_stream_index = stream['index']
+                self.processing_queue.put((input_video.absolute(), output_video.absolute()))
-                    break
 
-            # exit if no video stream found
+        # record video count for external calls
-            if video_stream_index is None:
+        self.total_videos = self.processing_queue.qsize()
-                Avalon.error(_('Aborting: No video stream found'))
-                raise StreamNotFoundError('no video stream found')
 
-            # extract frames from video
+        while not self.processing_queue.empty():
-            fm.extract_frames(self.input_video, self.extracted_frames)
+            self.current_input_video, output_video = self.processing_queue.get()
+            # drivers that have native support for video processing
+            if self.driver == 'anime4kcpp':
+                # append FFmpeg path to the end of PATH
+                # Anime4KCPP will then use FFmpeg to migrate audio tracks
+                os.environ['PATH'] += f';{self.ffmpeg_settings["ffmpeg_path"]}'
+                Avalon.info(_('Starting to upscale extracted images'))
 
-            # get average frame rate of video stream
+                # run Anime4KCPP
-            framerate = float(Fraction(video_info['streams'][video_stream_index]['avg_frame_rate']))
+                self.process_pool.append(self.driver_object.upscale(self.current_input_video, output_video))
-            fm.pixel_format = video_info['streams'][video_stream_index]['pix_fmt']
+                self._wait()
+                Avalon.info(_('Upscaling completed'))
 
-            # get a dict of all pixel formats and corresponding bit depth
+            else:
-            pixel_formats = fm.get_pixel_formats()
+                try:
+                    self.create_temp_directories()
 
-            # try getting pixel format's corresponding bti depth
+                    # initialize objects for ffmpeg and waifu2x-caffe
-            try:
+                    fm = Ffmpeg(self.ffmpeg_settings, self.image_format)
-                self.bit_depth = pixel_formats[fm.pixel_format]
-            except KeyError:
-                Avalon.error(_('Unsupported pixel format: {}').format(fm.pixel_format))
-                raise UnsupportedPixelError(f'unsupported pixel format {fm.pixel_format}')
 
-            Avalon.info(_('Framerate: {}').format(framerate))
+                    Avalon.info(_('Reading video information'))
+                    video_info = fm.get_video_info(self.current_input_video)
+                    # analyze original video with FFprobe and retrieve framerate
+                    # width, height = info['streams'][0]['width'], info['streams'][0]['height']
 
-            # width/height will be coded width/height x upscale factor
+                    # find index of video stream
-            if self.scale_ratio:
+                    video_stream_index = None
-                original_width = video_info['streams'][video_stream_index]['width']
+                    for stream in video_info['streams']:
-                original_height = video_info['streams'][video_stream_index]['height']
+                        if stream['codec_type'] == 'video':
-                self.scale_width = int(self.scale_ratio * original_width)
+                            video_stream_index = stream['index']
-                self.scale_height = int(self.scale_ratio * original_height)
+                            break
 
-            # upscale images one by one using waifu2x
+                    # exit if no video stream found
-            Avalon.info(_('Starting to upscale extracted images'))
+                    if video_stream_index is None:
-            self._upscale_frames()
+                        Avalon.error(_('Aborting: No video stream found'))
-            Avalon.info(_('Upscaling completed'))
+                        raise StreamNotFoundError('no video stream found')
 
-            # frames to Video
+                    # extract frames from video
-            Avalon.info(_('Converting extracted frames into video'))
+                    self.process_pool.append((fm.extract_frames(self.current_input_video, self.extracted_frames)))
+                    self._wait()
 
-            # use user defined output size
+                    # get average frame rate of video stream
-            fm.convert_video(framerate, f'{self.scale_width}x{self.scale_height}', self.upscaled_frames)
+                    framerate = float(Fraction(video_info['streams'][video_stream_index]['r_frame_rate']))
-            Avalon.info(_('Conversion completed'))
+                    fm.pixel_format = video_info['streams'][video_stream_index]['pix_fmt']
 
-            # migrate audio tracks and subtitles
+                    if self.driver == 'waifu2x_caffe':
-            Avalon.info(_('Migrating audio tracks and subtitles to upscaled video'))
+                        # get a dict of all pixel formats and corresponding bit depth
-            fm.migrate_audio_tracks_subtitles(self.input_video, self.output_video, self.upscaled_frames)
+                        pixel_formats = fm.get_pixel_formats()
 
-            # destroy temp directories
+                        # try getting pixel format's corresponding bti depth
-            self.cleanup_temp_directories()
+                        try:
+                            self.driver_settings['output_depth'] = pixel_formats[fm.pixel_format]
+                        except KeyError:
+                            Avalon.error(_('Unsupported pixel format: {}').format(fm.pixel_format))
+                            raise UnsupportedPixelError(f'unsupported pixel format {fm.pixel_format}')
+
+                    Avalon.info(_('Framerate: {}').format(framerate))
+
+                    # width/height will be coded width/height x upscale factor
+                    original_width = video_info['streams'][video_stream_index]['width']
+                    original_height = video_info['streams'][video_stream_index]['height']
+                    scale_width = int(self.scale_ratio * original_width)
+                    scale_height = int(self.scale_ratio * original_height)
+
+                    # upscale images one by one using waifu2x
+                    Avalon.info(_('Starting to upscale extracted images'))
+                    self._upscale_frames()
+                    Avalon.info(_('Upscaling completed'))
+
+                    # frames to Video
+                    Avalon.info(_('Converting extracted frames into video'))
+
+                    # use user defined output size
+                    self.process_pool.append(fm.assemble_video(framerate,
+                                                               f'{scale_width}x{scale_height}',
+                                                               self.upscaled_frames))
+                    self._wait()
+                    Avalon.info(_('Conversion completed'))
+
+                    try:
+                        # migrate audio tracks and subtitles
+                        Avalon.info(_('Migrating audio, subtitles and other streams to upscaled video'))
+                        self.process_pool.append(fm.migrate_streams(self.current_input_video,
+                                                                    output_video,
+                                                                    self.upscaled_frames))
+                        self._wait()
+
+                    # if failed to copy streams
+                    # use file with only video stream
+                    except subprocess.CalledProcessError:
+                        Avalon.error(_('Failed to migrate streams'))
+                        Avalon.warning(_('Trying to output video without additional streams'))
+
+                        # construct output file path
+                        output_video_path = output_video.parent / f'{output_video.stem}{fm.intermediate_file_name.suffix}'
+
+                        # if output file already exists, cancel
+                        if output_video_path.exists():
+                            Avalon.error(_('Output video file exists, aborting'))
+
+                        # otherwise, rename intermediate file to the output file
+                        else:
+                            Avalon.info(_('Writing intermediate file to: {}').format(output_video_path.absolute()))
+                            (self.upscaled_frames / fm.intermediate_file_name).rename(output_video_path)
+
+                    # destroy temp directories
+                    self.cleanup_temp_directories()
+
+                except (Exception, KeyboardInterrupt, SystemExit) as e:
+                    with contextlib.suppress(ValueError):
+                        self.cleanup_temp_directories()
+                        self.running = False
+                    raise e
+
+            # increment total number of videos processed
+            self.total_processed += 1
+
+        # signal upscaling completion
+        self.running = False

src/video2x.pot

@@ -0,0 +1,262 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2020-05-11 04:39-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=cp1252\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#: progress_monitor.py:42
+msgid "Upscaling Progress"
+msgstr ""
+
+#: upscaler.py:104
+msgid "Specified or default cache directory is a file/link"
+msgstr ""
+
+#: upscaler.py:110
+msgid "Creating cache directory {}"
+msgstr ""
+
+#: upscaler.py:113
+msgid "Unable to create {}"
+msgstr ""
+
+#: upscaler.py:118
+msgid "Extracted frames are being saved to: {}"
+msgstr ""
+
+#: upscaler.py:120
+msgid "Upscaled frames are being saved to: {}"
+msgstr ""
+
+#: upscaler.py:130
+msgid "Cleaning up cache directory: {}"
+msgstr ""
+
+#: upscaler.py:133
+msgid "Unable to delete: {}"
+msgstr ""
+
+#: upscaler.py:139 upscaler.py:154 upscaler.py:165
+msgid "Input and output path type mismatch"
+msgstr ""
+
+#: upscaler.py:140
+msgid "Input is multiple files but output is not directory"
+msgstr ""
+
+#: upscaler.py:144
+msgid "Input path {} is neither a file nor a directory"
+msgstr ""
+
+#: upscaler.py:148 upscaler.py:170
+msgid "Input directory and output directory cannot be the same"
+msgstr ""
+
+#: upscaler.py:155
+msgid "Input is single file but output is directory"
+msgstr ""
+
+#: upscaler.py:158
+msgid "No suffix found in output file path"
+msgstr ""
+
+#: upscaler.py:159
+msgid "Suffix must be specified for FFmpeg"
+msgstr ""
+
+#: upscaler.py:166
+msgid "Input is directory but output is existing single file"
+msgstr ""
+
+#: upscaler.py:175
+msgid "Input path is neither a file nor a directory"
+msgstr ""
+
+#: upscaler.py:184
+msgid "FFmpeg or FFprobe cannot be found under the specified path"
+msgstr ""
+
+#: upscaler.py:185 upscaler.py:195
+msgid "Please check the configuration file settings"
+msgstr ""
+
+#: upscaler.py:194
+msgid "Specified driver executable directory doesn't exist"
+msgstr ""
+
+#: upscaler.py:221
+msgid "Failed to parse driver argument: {}"
+msgstr ""
+
+#: upscaler.py:253
+msgid "Unrecognized driver: {}"
+msgstr ""
+
+#: upscaler.py:293
+msgid "Starting progress monitor"
+msgstr ""
+
+#: upscaler.py:298
+msgid "Starting upscaled image cleaner"
+msgstr ""
+
+#: upscaler.py:307 upscaler.py:324
+msgid "Killing progress monitor"
+msgstr ""
+
+#: upscaler.py:310 upscaler.py:327
+msgid "Killing upscaled image cleaner"
+msgstr ""
+
+#: upscaler.py:331
+msgid "Terminating all processes"
+msgstr ""
+
+#: upscaler.py:338
+msgid "Main process waiting for subprocesses to exit"
+msgstr ""
+
+#: upscaler.py:357 upscaler.py:361
+msgid "Subprocess {} exited with code {}"
+msgstr ""
+
+#: upscaler.py:367
+msgid "Stop signal received"
+msgstr ""
+
+#: upscaler.py:372
+msgid "Subprocess execution ran into an error"
+msgstr ""
+
+#: upscaler.py:421
+msgid "Upscaling single video file: {}"
+msgstr ""
+
+#: upscaler.py:443 upscaler.py:502
+msgid "Starting to upscale extracted images"
+msgstr ""
+
+#: upscaler.py:448 upscaler.py:504
+msgid "Upscaling completed"
+msgstr ""
+
+#: upscaler.py:457
+msgid "Reading video information"
+msgstr ""
+
+#: upscaler.py:471
+msgid "Aborting: No video stream found"
+msgstr ""
+
+#: upscaler.py:490
+msgid "Unsupported pixel format: {}"
+msgstr ""
+
+#: upscaler.py:493
+msgid "Framerate: {}"
+msgstr ""
+
+#: upscaler.py:507
+msgid "Converting extracted frames into video"
+msgstr ""
+
+#: upscaler.py:514
+msgid "Conversion completed"
+msgstr ""
+
+#: upscaler.py:518
+msgid "Migrating audio, subtitles and other streams to upscaled video"
+msgstr ""
+
+#: upscaler.py:527
+msgid "Failed to migrate streams"
+msgstr ""
+
+#: upscaler.py:528
+msgid "Trying to output video without additional streams"
+msgstr ""
+
+#: upscaler.py:535
+msgid "Output video file exists, aborting"
+msgstr ""
+
+#: upscaler.py:539
+msgid "Writing intermediate file to: {}"
+msgstr ""
+
+#: video2x.py:84
+msgid ""
+"Video2X Version: {}\n"
+"Author: K4YT3X\n"
+"License: GNU GPL v3\n"
+"Github Page: https://github.com/k4yt3x/video2x\n"
+"Contact: k4yt3x@k4yt3x.com"
+msgstr ""
+
+#: video2x.py:106
+msgid "Video2X Options"
+msgstr ""
+
+#: video2x.py:107
+msgid "show this help message and exit"
+msgstr ""
+
+#: video2x.py:108
+msgid "source video file/directory"
+msgstr ""
+
+#: video2x.py:109
+msgid "output video file/directory"
+msgstr ""
+
+#: video2x.py:110
+msgid "video2x config file path"
+msgstr ""
+
+#: video2x.py:112
+msgid "display version, lawful information and exit"
+msgstr ""
+
+#: video2x.py:115
+msgid "Upscaling Options"
+msgstr ""
+
+#: video2x.py:116
+msgid "upscaling driver"
+msgstr ""
+
+#: video2x.py:117
+msgid "scaling ratio"
+msgstr ""
+
+#: video2x.py:118
+msgid "number of processes to use for upscaling"
+msgstr ""
+
+#: video2x.py:119
+msgid "preserve extracted and upscaled frames"
+msgstr ""
+
+#: video2x.py:159
+msgid "This file cannot be imported"
+msgstr ""
+
+#: video2x.py:229
+msgid "Program completed, taking {} seconds"
+msgstr ""
+
+#: video2x.py:232
+msgid "An exception has occurred"
+msgstr ""
+

src/video2x.py

@@ -13,7 +13,7 @@ __      __  _       _                  ___   __   __
 Name: Video2X Controller
 Creator: K4YT3X
 Date Created: Feb 24, 2018
-Last Modified: May 4, 2020
+Last Modified: May 10, 2020
 
 Editor: BrianPetkovsek
 Last Modified: June 17, 2019
@@ -54,13 +54,11 @@ from upscaler import Upscaler
 
 # built-in imports
 import argparse
-import contextlib
 import gettext
 import importlib
 import locale
+import os
 import pathlib
-import re
-import shutil
 import sys
 import tempfile
 import time
@@ -105,21 +103,20 @@ def parse_arguments():
     parser = argparse.ArgumentParser(prog='video2x', formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
 
     # video options
-    general_options = parser.add_argument_group(_('General Options'))
+    video2x_options = parser.add_argument_group(_('Video2X Options'))
-    general_options.add_argument('-h', '--help', action='help', help=_('show this help message and exit'))
+    video2x_options.add_argument('-h', '--help', action='help', help=_('show this help message and exit'))
-    general_options.add_argument('-i', '--input', type=pathlib.Path, help=_('source video file/directory'))
+    video2x_options.add_argument('-i', '--input', type=pathlib.Path, help=_('source video file/directory'))
-    general_options.add_argument('-o', '--output', type=pathlib.Path, help=_('output video file/directory'))
+    video2x_options.add_argument('-o', '--output', type=pathlib.Path, help=_('output video file/directory'))
-    general_options.add_argument('-c', '--config', type=pathlib.Path, help=_('video2x config file path'), action='store',
+    video2x_options.add_argument('-c', '--config', type=pathlib.Path, help=_('video2x config file path'), action='store',
                                  default=pathlib.Path(__file__).parent.absolute() / 'video2x.yaml')
-    general_options.add_argument('-d', '--driver', help=_('upscaling driver'), choices=AVAILABLE_DRIVERS, default='waifu2x_caffe')
+    video2x_options.add_argument('-v', '--version', help=_('display version, lawful information and exit'), action='store_true')
-    general_options.add_argument('-p', '--processes', help=_('number of processes to use for upscaling'), action='store', type=int, default=1)
-    general_options.add_argument('-v', '--version', help=_('display version, lawful information and exit'), action='store_true')
 
     # scaling options
-    scaling_options = parser.add_argument_group(_('Scaling Options'))
+    upscaling_options = parser.add_argument_group(_('Upscaling Options'))
-    scaling_options.add_argument('--width', help=_('output video width'), action='store', type=int)
+    upscaling_options.add_argument('-d', '--driver', help=_('upscaling driver'), choices=AVAILABLE_DRIVERS, default='waifu2x_caffe')
-    scaling_options.add_argument('--height', help=_('output video height'), action='store', type=int)
+    upscaling_options.add_argument('-r', '--ratio', help=_('scaling ratio'), action='store', type=float, default=2.0)
-    scaling_options.add_argument('-r', '--ratio', help=_('scaling ratio'), action='store', type=float)
+    upscaling_options.add_argument('-p', '--processes', help=_('number of processes to use for upscaling'), action='store', type=int, default=1)
+    upscaling_options.add_argument('--preserve_frames', help=_('preserve extracted and upscaled frames'), action='store_true')
 
     # if no driver arguments are specified
     if '--' not in sys.argv:
@@ -178,6 +175,27 @@ config = read_config(video2x_args.config)
 
 # load waifu2x configuration
 driver_settings = config[video2x_args.driver]
+driver_settings['path'] = os.path.expandvars(driver_settings['path'])
+
+# read FFmpeg configuration
+ffmpeg_settings = config['ffmpeg']
+ffmpeg_settings['ffmpeg_path'] = os.path.expandvars(ffmpeg_settings['ffmpeg_path'])
+
+# load video2x settings
+image_format = config['video2x']['image_format'].lower()
+preserve_frames = config['video2x']['preserve_frames']
+
+# if preserve frames specified in command line
+# overwrite config file options
+if video2x_args.preserve_frames is True:
+    preserve_frames = True
+
+# if cache directory not specified
+# use default path: %TEMP%\video2x
+if config['video2x']['video2x_cache_directory'] is None:
+    video2x_cache_directory = (pathlib.Path(tempfile.gettempdir()) / 'video2x')
+else:
+    video2x_cache_directory = pathlib.Path(config['video2x']['video2x_cache_directory'])
 
 # overwrite driver_settings with driver_args
 if driver_args is not None:
@@ -186,126 +204,30 @@ if driver_args is not None:
         if driver_args_dict[key] is not None:
             driver_settings[key] = driver_args_dict[key]
 
-# check if driver path exists
-if not pathlib.Path(driver_settings['path']).exists():
-    if not pathlib.Path(f'{driver_settings["path"]}.exe').exists():
-        Avalon.error(_('Specified driver executable directory doesn\'t exist'))
-        Avalon.error(_('Please check the configuration file settings'))
-        raise FileNotFoundError(driver_settings['path'])
-
-# read FFmpeg configuration
-ffmpeg_settings = config['ffmpeg']
-
-# load video2x settings
-image_format = config['video2x']['image_format'].lower()
-preserve_frames = config['video2x']['preserve_frames']
-
-# load cache directory
-if config['video2x']['video2x_cache_directory'] is not None:
-    video2x_cache_directory = pathlib.Path(config['video2x']['video2x_cache_directory'])
-else:
-    video2x_cache_directory = pathlib.Path(tempfile.gettempdir()) / 'video2x'
-
-if video2x_cache_directory.exists() and not video2x_cache_directory.is_dir():
-    Avalon.error(_('Specified cache directory is a file/link'))
-    raise FileExistsError('Specified cache directory is a file/link')
-
-# if cache directory doesn't exist
-# ask the user if it should be created
-elif not video2x_cache_directory.exists():
-    try:
-        Avalon.debug_info(_('Creating cache directory {}').format(video2x_cache_directory))
-        video2x_cache_directory.mkdir(parents=True, exist_ok=True)
-    # there can be a number of exceptions here
-    # PermissionError, FileExistsError, etc.
-    # therefore, we put a catch-them-all here
-    except Exception as exception:
-        Avalon.error(_('Unable to create {}').format(video2x_cache_directory))
-        raise exception
-
-
 # start execution
 try:
     # start timer
     begin_time = time.time()
 
-    # if input specified is a single file
+    # initialize upscaler object
-    if video2x_args.input.is_file():
+    upscaler = Upscaler(input_path=video2x_args.input,
+                        output_path=video2x_args.output,
+                        driver_settings=driver_settings,
+                        ffmpeg_settings=ffmpeg_settings)
 
-        # upscale single video file
+    # set upscaler optional options
-        Avalon.info(_('Upscaling single video file: {}').format(video2x_args.input))
+    upscaler.driver = video2x_args.driver
+    upscaler.scale_ratio = video2x_args.ratio
+    upscaler.processes = video2x_args.processes
+    upscaler.video2x_cache_directory = video2x_cache_directory
+    upscaler.image_format = image_format
+    upscaler.preserve_frames = preserve_frames
 
-        # check for input output format mismatch
+    # run upscaler
-        if video2x_args.output.is_dir():
+    upscaler.run()
-            Avalon.error(_('Input and output path type mismatch'))
-            Avalon.error(_('Input is single file but output is directory'))
-            raise Exception('input output path type mismatch')
-        if not re.search(r'.*\..*$', str(video2x_args.output)):
-            Avalon.error(_('No suffix found in output file path'))
-            Avalon.error(_('Suffix must be specified for FFmpeg'))
-            raise Exception('No suffix specified')
-
-        upscaler = Upscaler(input_video=video2x_args.input,
-                            output_video=video2x_args.output,
-                            driver_settings=driver_settings,
-                            ffmpeg_settings=ffmpeg_settings)
-
-        # set optional options
-        upscaler.driver = video2x_args.driver
-        upscaler.scale_width = video2x_args.width
-        upscaler.scale_height = video2x_args.height
-        upscaler.scale_ratio = video2x_args.ratio
-        upscaler.processes = video2x_args.processes
-        upscaler.video2x_cache_directory = video2x_cache_directory
-        upscaler.image_format = image_format
-        upscaler.preserve_frames = preserve_frames
-
-        # run upscaler
-        upscaler.run()
-
-    # if input specified is a directory
-    elif video2x_args.input.is_dir():
-        # upscale videos in a directory
-        Avalon.info(_('Upscaling videos in directory: {}').format(video2x_args.input))
-
-        # make output directory if it doesn't exist
-        video2x_args.output.mkdir(parents=True, exist_ok=True)
-
-        for input_video in [f for f in video2x_args.input.iterdir() if f.is_file()]:
-            output_video = video2x_args.output / input_video.name
-            upscaler = Upscaler(input_video=input_video,
-                                output_video=output_video,
-                                driver_settings=driver_settings,
-                                ffmpeg_settings=ffmpeg_settings)
-
-            # set optional options
-            upscaler.driver = video2x_args.driver
-            upscaler.scale_width = video2x_args.width
-            upscaler.scale_height = video2x_args.height
-            upscaler.scale_ratio = video2x_args.ratio
-            upscaler.processes = video2x_args.processes
-            upscaler.video2x_cache_directory = video2x_cache_directory
-            upscaler.image_format = image_format
-            upscaler.preserve_frames = preserve_frames
-
-            # run upscaler
-            upscaler.run()
-    else:
-        Avalon.error(_('Input path is neither a file nor a directory'))
-        raise FileNotFoundError(f'{video2x_args.input} is neither file nor directory')
 
     Avalon.info(_('Program completed, taking {} seconds').format(round((time.time() - begin_time), 5)))
 
 except Exception:
     Avalon.error(_('An exception has occurred'))
     traceback.print_exc()
-
-    # try cleaning up temp directories
-    with contextlib.suppress(Exception):
-        upscaler.cleanup_temp_directories()
-
-finally:
-    # remove Video2X cache directory
-    with contextlib.suppress(FileNotFoundError):
-        if not preserve_frames:
-            shutil.rmtree(video2x_cache_directory)

src/video2x.yaml

@@ -1,53 +1,62 @@
+# Name: Video2X Configuration File
+# Creator: K4YT3X
+# Date Created: October 23, 2018
+# Last Modified: May 9, 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
+#   or parameters handled by Video2X internally.
 waifu2x_caffe:
-  path: 'C:\Users\K4YT3X\AppData\Local\video2x\waifu2x-caffe\waifu2x-caffe-cui'
+  path: '%LOCALAPPDATA%\video2x\waifu2x-caffe\waifu2x-caffe-cui'
-  input_extention_list: null
+  tta: 0 # <0|1> 8x slower and slightly high quality
-  output_extention: null
+  gpu: 0 # gpu device no
-  mode: noise_scale
+  batch_size: 1 # input batch size
-  scale_ratio: null
+  crop_h: null # input image split size(height)
-  scale_width: null
+  crop_w: null # input image split size(width)
-  scale_height: null
+  crop_size: 128 # input image split size
-  noise_level: 3
+  output_depth: 8 # output image chanel depth bit
-  process: gpu
+  output_quality: -1 # output image quality
-  crop_size: 128
+  process: gpu # <cpu|gpu|cudnn> process mode
-  output_quality: -1
+  model_dir: null # path to custom model directory (don't append last / )
-  output_depth: 8
+  scale_height: 0 # custom scale height (specifying this will overwrite scale_ratio)
-  batch_size: 1
+  scale_width: 0 # custom scale width (specifying this will overwrite scale_ratio)
-  gpu: 0
+  #scale_ratio: null # custom scale ratio
-  tta: 0
+  noise_level: 3 # <0|1|2|3> noise reduction level
-  input_path: null
+  mode: noise_scale # <noise|scale|noise_scale|auto_scale> image processing mode
-  output_path: null
+  output_extention: null # extension to output image file when output_path is (auto) or input_path is folder
-  model_dir: null
+  input_extention_list: null # extension to input image file when input_path is folder
-  crop_w: null
+  #output_path: null # path to output image file (when input_path is folder, output_path must be folder)
-  crop_h: null
+  #input_path: null # (required) path to input image file
 waifu2x_converter_cpp:
-  path: 'C:\Users\K4YT3X\AppData\Local\video2x\waifu2x-converter-cpp\waifu2x-converter-cpp'
+  path: '%LOCALAPPDATA%\video2x\waifu2x-converter-cpp\waifu2x-converter-cpp'
-  # list-supported-formats: null
+  #list-supported-formats: null # dump currently supported format list
-  # list-opencv-formats: null
+  #list-opencv-formats: null # (deprecated. Use --list-supported-formats) dump opencv supported format list
-  # list-processor
+  #list-processor # dump processor list
-  output-format: progress_bar_exit_signal
+  output-format: null # The format used when running in recursive/folder mode
-  png-compression: 5
+  png-compression: 5 # Set PNG compression level (0-9), 9 = Max compression (slowest & smallest)
-  image-quality: -1
+  image-quality: -1 # JPEG & WebP Compression quality (-1-101, 0 being smallest size and lowest quality, -1 being default), use 101 for lossless WebP
-  block-size: 0
+  block-size: 0 # block size
-  disable-gpu: false
+  disable-gpu: false # disable GPU
-  force-OpenCL: false
+  force-OpenCL: false # force to use OpenCL on Intel Platform
-  processor: -1
+  processor: -1 # set target processor (-1 uses default device)
-  jobs: 0
+  jobs: 0 # number of threads launching at the same time
-  model-dir: null # models_rgb
+  model-dir: null # path to custom model directory (don't append last / ) default: models_rgb
-  scale-ratio: 2.0
+  #scale-ratio: 2.0 # custom scale ratio
-  noise-level: 1
+  noise-level: 1 # <0|1|2|3> noise reduction level
-  mode: noise-scale
+  mode: noise-scale # <noise|scale|noise-scale> image processing mode
-  log-level: 1
+  log-level: 1 # <0|1|2|3|4> Set log level
-  silent: null
+  silent: true # Enable silent mode. (same as --log-level 1)
-  tta: 0
+  tta: 0 # Enable Test-Time Augmentation mode. (0 or 1)
-  # generate-subdir: 0
+  #generate-subdir: 0 # Generate sub folder when recursive directory is enabled.
-  # recursive-directory: 0
+  #auto-naming: 0 # Add postfix to output name when output path is not specified.
-  output: null
+  #recursive-directory: 0 # Search recursively through directories to find more images to process.
-  input: null
+  #output: null # path to output image file or directory  (you should use the full path)
+  #input: null # (required) path to input image file or directory (you should use the full path)
 waifu2x_ncnn_vulkan:
-  path: 'C:\Users\K4YT3X\AppData\Local\video2x\waifu2x-ncnn-vulkan\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
+  #i: null # input-path: input image path (jpg/png) or directory
-  o: null # output-path: output image path (png) or directory
+  #o: null # output-path: output image path (png) 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)
@@ -56,10 +65,10 @@ waifu2x_ncnn_vulkan:
   j: '1:2:2' # thread count for load/proc/save (default=1:2:2)
   x: false # enable tta mode
 srmd_ncnn_vulkan:
-  path: 'C:\Users\K4YT3X\AppData\Local\video2x\srmd-ncnn-vulkan\srmd-ncnn-vulkan'
+  path: '%LOCALAPPDATA%\video2x\srmd-ncnn-vulkan\srmd-ncnn-vulkan'
   v: null # verbose output
-  i: null # input-path: input image path (jpg/png) or directory
+  #i: null # input-path: input image path (jpg/png) or directory
-  o: null # output-path: output image path (png) or directory
+  #o: null # output-path: output image path (png) or directory
   'n': 3 # noise-level: denoise level (-1/0/1/2/3/4/5/6/7/8/9/10, default=3)
   s: 2 # upscale ratio (2/3/4, default=2)
   t: 400 # tile-size: tile size (>=32, default=400)
@@ -68,9 +77,9 @@ srmd_ncnn_vulkan:
   j: '1:2:2' # thread count for load/proc/save (default=1:2:2)
   x: false # enable tta mode
 anime4kcpp:
-  path: 'C:\Users\K4YT3X\AppData\Local\video2x\anime4kcpp\CLI\Anime4KCPP_CLI\Anime4KCPP_CLI'
+  path: '%LOCALAPPDATA%\video2x\anime4kcpp\CLI\Anime4KCPP_CLI\Anime4KCPP_CLI'
-  input: null # File for loading (string [=./pic/p1.png])
+  #input: null # File for loading (string [=./pic/p1.png])
-  output: null # File for outputting (string [=output.png])
+  #output: null # File for outputting (string [=output.png])
   passes: 2 # Passes for processing (int [=2])
   pushColorCount: 2 # Limit the number of color pushes (int [=2])
   strengthColor: 0.3 # Strength for pushing color,range 0 to 1,higher for thinner (double [=0.3])
@@ -80,22 +89,28 @@ anime4kcpp:
   fastMode: false # Faster but maybe low quality
   videoMode: true # Video process
   preview: null # Preview image
-  preProcessing: False # Enable pre processing
+  preprocessing: False # Enable pre processing
-  postProcessing: False # Enable post 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
   listGPUs: null # list GPUs
   platformID: 0 # Specify the platform ID (unsigned int [=0])
   deviceID: 0 # Specify the device ID (unsigned int [=0])
+  codec: mp4v # Specify the codec for encoding from mp4v(recommended in Windows), dxva(for Windows), avc1(H264, recommended in Linux), vp09(very slow), hevc(not support in Windowds), av01(not support in Windowds) (string [=mp4v])
 ffmpeg:
-  ffmpeg_path: 'C:\Users\K4YT3X\AppData\Local\video2x\ffmpeg-latest-win64-static\bin'
+  ffmpeg_path: '%LOCALAPPDATA%\video2x\ffmpeg-latest-win64-static\bin'
+  intermediate_file_name: 'intermediate.mkv'
+  # step 1: extract all frames from original video
+  # into temporary directory
   video_to_frames:
     output_options:
       '-qscale:v': null
       '-pix_fmt': rgba64be
     '-hwaccel': auto
     '-y': true
+  # step 2: stitch all frames back into a video
+  # with only a video track
   frames_to_video:
     input_options:
       '-qscale:v': null
@@ -108,6 +123,8 @@ ffmpeg:
       '-pix_fmt': null
     '-hwaccel': auto
     '-y': true
+  # step 3: migrate audio and subtitle tracks from original
+  # video into the upscaled video
   migrating_tracks:
     output_options:
       '-map':
@@ -118,6 +135,7 @@ ffmpeg:
         - '1:t?'
       '-c': copy
       '-pix_fmt': null
+      '-metadata': 'comment=Upscaled by Video2X'
     '-hwaccel': auto
     '-y': true
 video2x:

src/video2x_gui.pyproject.user

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.12.0, 2020-05-11T04:13:22. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{25c1e4a4-6b4a-4828-883b-6f32c3f7eba0}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey">
+    <value type="QString">-fno-delayed-template-parsing</value>
+   </valuelist>
+   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+   <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.Questionable</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">8</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop (x86-windows-msvc2019-pe-64bit)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop (x86-windows-msvc2019-pe-64bit)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{5450e32e-f498-4c15-a0a5-7456f3375388}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+     <value type="QString">cpu-cycles</value>
+    </valuelist>
+    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+    <value type="int" key="Analyzer.Perf.Frequency">250</value>
+    <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
+     <value type="QString">-e</value>
+     <value type="QString">cpu-cycles</value>
+     <value type="QString">--call-graph</value>
+     <value type="QString">dwarf,4096</value>
+     <value type="QString">-F</value>
+     <value type="QString">250</value>
+    </valuelist>
+    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">video2x_gui</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">PythonEditor.RunConfiguration.C:/Users/k4yt3x/Documents/Projects/video2x/src/video2x_gui.py</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/k4yt3x/Documents/Projects/video2x/src/video2x_gui.py</value>
+    <value type="bool" key="PythonEditor.RunConfiguation.Buffered">false</value>
+    <value type="QString" key="PythonEditor.RunConfiguation.Interpreter">{ffc39ed5-fbe0-4af8-8b16-9a60c393bdb8}</value>
+    <value type="QString" key="PythonEditor.RunConfiguation.Script">C:\Users\k4yt3x\Documents\Projects\video2x\src\video2x_gui.py</value>
+    <value type="QString" key="RunConfiguration.Arguments"></value>
+    <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
+    <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">22</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">22</value>
+ </data>
+</qtcreator>

src/video2x_setup.py

@@ -4,7 +4,7 @@
 Name: Video2X Setup Script
 Creator: K4YT3X
 Date Created: November 28, 2018
-Last Modified: May 5, 2020
+Last Modified: May 8, 2020
 
 Editor: BrianPetkovsek
 Editor: SAT3LL
@@ -260,16 +260,19 @@ class Video2xSetup:
 
         # configure only the specified drivers
         if self.driver == 'all':
-            template_dict['waifu2x_caffe']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-caffe' / 'waifu2x-caffe-cui.exe')
+            template_dict['waifu2x_caffe']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-caffe' / 'waifu2x-caffe-cui')
-            template_dict['waifu2x_converter_cpp']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-converter-cpp')
+            template_dict['waifu2x_converter_cpp']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-converter-cpp' / 'waifu2x-converter-cpp')
-            template_dict['waifu2x_ncnn_vulkan']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-ncnn-vulkan' / 'waifu2x-ncnn-vulkan.exe')
+            template_dict['waifu2x_ncnn_vulkan']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-ncnn-vulkan' / 'waifu2x-ncnn-vulkan')
+            template_dict['srmd_ncnn_vulkan']['path'] = str(LOCALAPPDATA / 'video2x' / 'srmd-ncnn-vulkan' / 'srmd-ncnn-vulkan')
             template_dict['anime4kcpp']['path'] = str(LOCALAPPDATA / 'video2x' / 'anime4kcpp' / 'CLI' / 'Anime4KCPP_CLI' / 'Anime4KCPP_CLI')
         elif self.driver == 'waifu2x_caffe':
-            template_dict['waifu2x_caffe']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-caffe' / 'waifu2x-caffe-cui.exe')
+            template_dict['waifu2x_caffe']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-caffe' / 'waifu2x-caffe-cui')
         elif self.driver == 'waifu2x_converter_cpp':
             template_dict['waifu2x_converter_cpp']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-converter-cpp' / 'waifu2x-converter-cpp')
         elif self.driver == 'waifu2x_ncnn_vulkan':
-            template_dict['waifu2x_ncnn_vulkan']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-ncnn-vulkan' / 'waifu2x-ncnn-vulkan.exe')
+            template_dict['waifu2x_ncnn_vulkan']['path'] = str(LOCALAPPDATA / 'video2x' / 'waifu2x-ncnn-vulkan' / 'waifu2x-ncnn-vulkan')
+        elif self.driver == 'srmd_ncnn_vulkan':
+            template_dict['srmd_ncnn_vulkan']['path'] = str(LOCALAPPDATA / 'video2x' / 'srmd-ncnn-vulkan' / 'srmd-ncnn-vulkan')
         elif self.driver == 'anime4kcpp':
             template_dict['anime4kcpp']['path'] = str(LOCALAPPDATA / 'video2x' / 'anime4kcpp' / 'CLI' / 'Anime4KCPP_CLI' / 'Anime4KCPP_CLI')
 

src/wrappers/anime4kcpp.py

@@ -4,7 +4,7 @@
 Name: Waifu2x Caffe Driver
 Author: K4YT3X
 Date Created: May 3, 2020
-Last Modified: May 4, 2020
+Last Modified: May 11, 2020
 
 Description: This class is a high-level wrapper
 for waifu2x-caffe.
@@ -13,6 +13,8 @@ for waifu2x-caffe.
 # built-in imports
 import argparse
 import os
+import pathlib
+import platform
 import shlex
 import subprocess
 import threading
@@ -29,32 +31,45 @@ class WrapperMain:
         self.driver_settings = driver_settings
         self.print_lock = threading.Lock()
 
+    @staticmethod
+    def zero_to_one_float(value):
+        value = float(value)
+        if value < 0.0 or value > 1.0:
+            raise argparse.ArgumentTypeError(f'{value} is not between 0.0 and 1.0')
+        return value
+
     @staticmethod
     def parse_arguments(arguments):
         parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
+        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('-i', '--input', type=pathlib.Path, help='File for loading')
+        parser.add_argument('-i', '--input', type=str, help=argparse.SUPPRESS)  # help='File for loading')
-        # parser.add_argument('-o', '--output', type=pathlib.Path, help='File for outputting')
+        parser.add_argument('-o', '--output', type=str, help=argparse.SUPPRESS)  # help='File for outputting')
         parser.add_argument('-p', '--passes', type=int, help='Passes for processing')
         parser.add_argument('-n', '--pushColorCount', type=int, help='Limit the number of color pushes')
-        parser.add_argument('-c', '--strengthColor', type=float, help='Strength for pushing color,range 0 to 1,higher for thinner')
+        parser.add_argument('-c', '--strengthColor', type=WrapperMain.zero_to_one_float, help='Strength for pushing color,range 0 to 1,higher for thinner')
-        parser.add_argument('-g', '--strengthGradient', type=float, help='Strength for pushing gradient,range 0 to 1,higher for sharper')
+        parser.add_argument('-g', '--strengthGradient', type=WrapperMain.zero_to_one_float, help='Strength for pushing gradient,range 0 to 1,higher for sharper')
         parser.add_argument('-z', '--zoomFactor', type=float, help='zoom factor for resizing')
         parser.add_argument('-t', '--threads', type=int, help='Threads count for video processing')
         parser.add_argument('-f', '--fastMode', action='store_true', help='Faster but maybe low quality')
-        # parser.add_argument('-v', '--videoMode', action='store_true', help='Video process')
+        parser.add_argument('-v', '--videoMode', action='store_true', help='Video process')
         parser.add_argument('-s', '--preview', action='store_true', help='Preview image')
-        parser.add_argument('-b', '--preProcessing', action='store_true', help='Enable pre processing')
+        parser.add_argument('-b', '--preprocessing', action='store_true', help='Enable pre processing')
-        parser.add_argument('-a', '--postProcessing', action='store_true', help='Enable post processing')
+        parser.add_argument('-a', '--postprocessing', action='store_true', help='Enable post processing')
         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('-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')
+        parser.add_argument('-C', '--codec', type=str, help='Specify the codec for encoding from mp4v(recommended in Windows), dxva(for Windows), avc1(H264, recommended in Linux), vp09(very slow), hevc(not support in Windowds), av01(not support in Windowds) (string [=mp4v])')
         return parser.parse_args(arguments)
 
-    def upscale(self, input_file, output_file, zoom_factor, threads):
+    def load_configurations(self, upscaler):
+        self.driver_settings['zoomFactor'] = upscaler.scale_ratio
+        self.driver_settings['threads'] = upscaler.processes
+
+    def upscale(self, input_file, output_file):
         """This is the core function for WAIFU2X class
 
         Arguments:
@@ -67,8 +82,11 @@ class WrapperMain:
         # overwrite config file settings
         self.driver_settings['input'] = input_file
         self.driver_settings['output'] = output_file
-        self.driver_settings['zoomFactor'] = zoom_factor
+
-        self.driver_settings['threads'] = threads
+        # Anime4KCPP will look for Anime4KCPPKernel.cl under the current working directory
+        # change the CWD to its containing directory so it will find it
+        if platform.system() == 'Windows':
+            os.chdir(pathlib.Path(self.driver_settings['path']).parent)
 
         # list to be executed
         # initialize the list with waifu2x binary path as the first element

src/wrappers/ffmpeg.py

@@ -4,7 +4,7 @@
 Name: Video2X FFmpeg Controller
 Author: K4YT3X
 Date Created: Feb 24, 2018
-Last Modified: November 15, 2019
+Last Modified: May 9, 2020
 
 Description: This class handles all FFmpeg related operations.
 """
@@ -32,7 +32,10 @@ class Ffmpeg:
         self.ffmpeg_path = pathlib.Path(self.ffmpeg_settings['ffmpeg_path'])
         self.ffmpeg_binary = self.ffmpeg_path / 'ffmpeg'
         self.ffmpeg_probe_binary = self.ffmpeg_path / 'ffprobe'
+
+        # video metadata
         self.image_format = image_format
+        self.intermediate_file_name = pathlib.Path(self.ffmpeg_settings['intermediate_file_name'])
         self.pixel_format = None
 
     def get_pixel_formats(self):
@@ -131,9 +134,9 @@ class Ffmpeg:
             extracted_frames / f'extracted_%0d.{self.image_format}'
         ])
 
-        self._execute(execute)
+        return(self._execute(execute))
 
-    def convert_video(self, framerate, resolution, upscaled_frames):
+    def assemble_video(self, framerate, resolution, upscaled_frames):
         """Converts images into videos
 
         This method converts a set of images into a video
@@ -177,12 +180,12 @@ class Ffmpeg:
 
         # specify output file location
         execute.extend([
-            upscaled_frames / 'no_audio.mp4'
+            upscaled_frames / self.intermediate_file_name
         ])
 
-        self._execute(execute)
+        return(self._execute(execute))
 
-    def migrate_audio_tracks_subtitles(self, input_video, output_video, upscaled_frames):
+    def migrate_streams(self, input_video, output_video, upscaled_frames):
         """ Migrates audio tracks and subtitles from input video to output video
 
         Arguments:
@@ -198,7 +201,7 @@ class Ffmpeg:
 
         execute.extend([
             '-i',
-            upscaled_frames / 'no_audio.mp4',
+            upscaled_frames / self.intermediate_file_name,
             '-i',
             input_video
         ])
@@ -209,7 +212,7 @@ class Ffmpeg:
             output_video
         ])
 
-        self._execute(execute)
+        return(self._execute(execute))
 
     def _read_configuration(self, phase, section=None):
         """ read configuration from JSON
@@ -284,4 +287,4 @@ class Ffmpeg:
 
         Avalon.debug_info(f'Executing: {execute}')
 
-        return subprocess.run(execute, check=True).returncode
+        return subprocess.Popen(execute)

src/wrappers/srmd_ncnn_vulkan.py

@@ -4,7 +4,7 @@
 Name: SRMD NCNN Vulkan Driver
 Creator: K4YT3X
 Date Created: April 26, 2020
-Last Modified: May 5, 2020
+Last Modified: May 11, 2020
 
 Description: This class is a high-level wrapper
 for srmd_ncnn_vulkan.
@@ -39,10 +39,11 @@ class WrapperMain:
     @staticmethod
     def parse_arguments(arguments):
         parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
+        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=pathlib.Path, help='input image path (jpg/png) or directory')
+        parser.add_argument('-i', type=str, help=argparse.SUPPRESS)  # help='input image path (jpg/png) or directory')
-        # parser.add_argument('-o', type=pathlib.Path, help='output image path (png) or directory')
+        parser.add_argument('-o', type=str, help=argparse.SUPPRESS)  # help='output image path (png) or directory')
         parser.add_argument('-n', type=int, choices=range(-1, 11), help='denoise level')
         parser.add_argument('-s', type=int, choices=range(2, 5), help='upscale ratio')
         parser.add_argument('-t', type=int, help='tile size (>=32)')
@@ -52,7 +53,11 @@ class WrapperMain:
         parser.add_argument('-x', action='store_true', help='enable tta mode')
         return parser.parse_args(arguments)
 
-    def upscale(self, input_directory, output_directory, scale_ratio):
+    def load_configurations(self, upscaler):
+        self.driver_settings['s'] = int(upscaler.scale_ratio)
+        self.driver_settings['j'] = '{}:{}:{}'.format(upscaler.processes, upscaler.processes, upscaler.processes)
+
+    def upscale(self, input_directory, output_directory):
         """This is the core function for SRMD ncnn Vulkan class
 
         Arguments:
@@ -64,7 +69,6 @@ class WrapperMain:
         # overwrite config file settings
         self.driver_settings['i'] = input_directory
         self.driver_settings['o'] = output_directory
-        self.driver_settings['s'] = scale_ratio
 
         # by default, srmd-ncnn-vulkan will look for the models under the current working directory
         # change the working directory to its containing folder if model directory not specified

src/wrappers/waifu2x_caffe.py

@@ -4,7 +4,7 @@
 Name: Waifu2x Caffe Driver
 Author: K4YT3X
 Date Created: Feb 24, 2018
-Last Modified: May 4, 2020
+Last Modified: May 11, 2020
 
 Description: This class is a high-level wrapper
 for waifu2x-caffe.
@@ -37,6 +37,7 @@ class WrapperMain:
     @staticmethod
     def parse_arguments(arguments):
         parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
+        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('-t', '--tta', type=int, choices=range(2), help='8x slower and slightly high quality')
         parser.add_argument('--gpu', type=int, help='gpu device no')
@@ -52,36 +53,30 @@ class WrapperMain:
         parser.add_argument('-w', '--scale_width', type=int, help='custom scale width')
         parser.add_argument('-s', '--scale_ratio', type=float, help='custom scale ratio')
         parser.add_argument('-n', '--noise_level', type=int, choices=range(4), help='noise reduction level')
-        parser.add_argument('-m', '--mode', choices=['noise', 'scale', 'noise_scale'], help='image processing mode')
+        parser.add_argument('-m', '--mode', choices=['noise', 'scale', 'noise_scale', 'auto_scale'], help='image processing mode')
-        parser.add_argument('-e', '--output_extension', type=str, help='extention to output image file when output_path is (auto) or input_path is folder')
+        parser.add_argument('-e', '--output_extention', type=str, help='extention to output image file when output_path is (auto) or input_path is folder')
         parser.add_argument('-l', '--input_extention_list', type=str, help='extention to input image file when input_path is folder')
-        # parser.add_argument('-o', '--output', type=pathlib.Path, help='path to output image file (when input_path is folder, output_path must be folder)')
+        parser.add_argument('-o', '--output', type=str, help=argparse.SUPPRESS)  # help='path to output image file (when input_path is folder, output_path must be folder)')
-        # parser.add_argument('-i', '--input_file', type=pathlib.Path, help='(required)  path to input image file')
+        parser.add_argument('-i', '--input_file', type=str, help=argparse.SUPPRESS)  # help='(required) path to input image file')
         return parser.parse_args(arguments)
 
-    def upscale(self, input_directory, output_directory, scale_ratio, scale_width, scale_height, image_format, bit_depth):
+    def load_configurations(self, upscaler):
-        """This is the core function for WAIFU2X class
+        # use scale width and scale height if specified
+        self.driver_settings['scale_ratio'] = upscaler.scale_ratio
+        self.driver_settings['output_extention'] = upscaler.image_format
 
-        Arguments:
+        # bit_depth will be 12 at this point
-            input_directory {string} -- source directory path
+        # it will up updated later
-            output_directory {string} -- output directory path
+        self.driver_settings['output_depth'] = 12
-            width {int} -- output video width
+
-            height {int} -- output video height
+    def upscale(self, input_directory, output_directory):
+        """ start upscaling process
         """
 
         # overwrite config file settings
         self.driver_settings['input_path'] = input_directory
         self.driver_settings['output_path'] = output_directory
 
-        if scale_ratio:
-            self.driver_settings['scale_ratio'] = scale_ratio
-        elif scale_width and scale_height:
-            self.driver_settings['scale_width'] = scale_width
-            self.driver_settings['scale_height'] = scale_height
-
-        self.driver_settings['output_extention'] = image_format
-        self.driver_settings['output_depth'] = bit_depth
-
         # list to be executed
         # initialize the list with waifu2x binary path as the first element
         execute = [self.driver_settings.pop('path')]

src/wrappers/waifu2x_converter_cpp.py

@@ -4,7 +4,7 @@
 Name: Waifu2x Converter CPP Driver
 Author: K4YT3X
 Date Created: February 8, 2019
-Last Modified: May 4, 2020
+Last Modified: May 11, 2020
 
 Description: This class is a high-level wrapper
 for waifu2x-converter-cpp.
@@ -38,13 +38,14 @@ class WrapperMain:
     @staticmethod
     def parse_arguments(arguments):
         parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
+        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('--list-supported-formats', action='store_true', help='dump currently supported format list')
         parser.add_argument('--list-opencv-formats', action='store_true', help='(deprecated. Use --list-supported-formats) dump opencv supported format list')
         parser.add_argument('-l', '--list-processor', action='store_true', help='dump processor list')
         parser.add_argument('-f', '--output-format', choices=['png', 'jpg'], help='The format used when running in recursive/folder mode\nSee --list-supported-formats for a list of supported formats/extensions.')
         parser.add_argument('-c', '--png-compression', type=int, choices=range(10), help='Set PNG compression level (0-9), 9 = Max compression (slowest & smallest)')
-        parser.add_argument('-q', '--image-quality', type=int, choices=range(100), help='JPEG & WebP Compression quality (0-101, 0 being smallest size and lowest quality), use 101 for lossless WebP')
+        parser.add_argument('-q', '--image-quality', type=int, choices=range(-1, 102), help='JPEG & WebP Compression quality (0-101, 0 being smallest size and lowest quality), use 101 for lossless WebP')
         parser.add_argument('--block-size', type=int, help='block size')
         parser.add_argument('--disable-gpu', action='store_true', help='disable GPU')
         parser.add_argument('--force-OpenCL', action='store_true', help='force to use OpenCL on Intel Platform')
@@ -60,12 +61,17 @@ class WrapperMain:
         parser.add_argument('-g', '--generate-subdir', type=int, choices=range(2), help='Generate sub folder when recursive directory is enabled.')
         parser.add_argument('-a', '--auto-naming', type=int, choices=range(2), help='Add postfix to output name when output path is not specified.\nSet 0 to disable this.')
         parser.add_argument('-r', '--recursive-directory', type=int, choices=range(2), help='Search recursively through directories to find more images to process.')
-        # parser.add_argument('-o', '--output', type=pathlib.Pathh, help='path to output image file or directory  (you should use the full path)')
+        parser.add_argument('-o', '--output', type=str, help=argparse.SUPPRESS)  # help='path to output image file or directory  (you should use the full path)')
-        # parser.add_argument('-i', '--input', type=pathlib.Path, help='(required)  path to input image file or directory (you should use the full path)')
+        parser.add_argument('-i', '--input', type=str, help=argparse.SUPPRESS)  # help='(required)  path to input image file or directory (you should use the full path)')
         parser.add_argument('--version', action='store_true', help='Displays version information and exits.')
         return parser.parse_args(arguments)
 
-    def upscale(self, input_directory, output_directory, scale_ratio, jobs, image_format):
+    def load_configurations(self, upscaler):
+        self.driver_settings['scale-ratio'] = upscaler.scale_ratio
+        self.driver_settings['jobs'] = upscaler.processes
+        self.driver_settings['output-format'] = upscaler.image_format.lower()
+
+    def upscale(self, input_directory, output_directory):
         """ Waifu2x Converter Driver Upscaler
         This method executes the upscaling of extracted frames.
 
@@ -79,9 +85,6 @@ class WrapperMain:
         # overwrite config file settings
         self.driver_settings['input'] = input_directory
         self.driver_settings['output'] = output_directory
-        self.driver_settings['scale-ratio'] = scale_ratio
-        self.driver_settings['jobs'] = jobs
-        self.driver_settings['output-format'] = image_format
 
         # models_rgb must be specified manually for waifu2x-converter-cpp
         # if it's not specified in the arguments, create automatically

src/wrappers/waifu2x_ncnn_vulkan.py

@@ -4,7 +4,7 @@
 Name: Waifu2x NCNN Vulkan Driver
 Creator: SAT3LL
 Date Created: June 26, 2019
-Last Modified: May 5, 2020
+Last Modified: May 11, 2020
 
 Editor: K4YT3X
 Last Modified: February 22, 2020
@@ -42,10 +42,11 @@ class WrapperMain:
     @staticmethod
     def parse_arguments(arguments):
         parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter, add_help=False)
+        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=pathlib.Path, help='input image path (jpg/png) or directory')
+        parser.add_argument('-i', type=str, help=argparse.SUPPRESS)  # help='input image path (jpg/png) or directory')
-        # parser.add_argument('-o', type=pathlib.Path, help='output image path (png) or directory')
+        parser.add_argument('-o', type=str, help=argparse.SUPPRESS)  # help='output image path (png) or directory')
         parser.add_argument('-n', type=int, choices=range(-1, 4), help='denoise level')
         parser.add_argument('-s', type=int, choices=range(1, 3), help='upscale ratio')
         parser.add_argument('-t', type=int, help='tile size (>=32)')
@@ -55,7 +56,11 @@ class WrapperMain:
         parser.add_argument('-x', action='store_true', help='enable tta mode')
         return parser.parse_args(arguments)
 
-    def upscale(self, input_directory, output_directory, scale_ratio):
+    def load_configurations(self, upscaler):
+        self.driver_settings['s'] = int(upscaler.scale_ratio)
+        self.driver_settings['j'] = '{}:{}:{}'.format(upscaler.processes, upscaler.processes, upscaler.processes)
+
+    def upscale(self, input_directory, output_directory):
         """This is the core function for WAIFU2X class
 
         Arguments:
@@ -67,7 +72,6 @@ class WrapperMain:
         # overwrite config file settings
         self.driver_settings['i'] = input_directory
         self.driver_settings['o'] = output_directory
-        self.driver_settings['s'] = int(scale_ratio)
 
         # by default, waifu2x-ncnn-vulkan will look for the models under the current working directory
         # change the working directory to its containing folder if model directory not specified