updated wordings and translations

.github/ISSUE_TEMPLATE/bug-report.md

@@ -7,26 +7,20 @@ assignees: K4YT3X
 
 ---
 
-## Environment Information
+## Component Versions
 
-|Module|Version|
+Please at least fill in the release version and GUI or CLI version.
-|-|-|
+
-|`Video2X`||
+- **Video2X release version**:
-|`FFmpeg`||
+- **Upscaler version**:
-|`waifu2x-caffe`||
+- **GUI version**:
-|`waifu2x-converter-cpp`||
+- **CLI version**:
-|`waifu2x-ncnn-vulkan`||
 
 ## Symptom
 
-Briefly describe what's going on.
+In this section, briefly describe what's going on.
 
-## Screenshots or Error Messages
+## Error Log or Screenshots
 
-Please paste screenshots or error messages here.
+Please upload or paste the error log here. You may also include screenshots.
-Include as much details as you can, as this greatly helps debugging the problem.
+**It is highly recommended to include your error log.**
-
-Please paste your error message in the code block down below:
-
-```
-```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,7 +9,7 @@ assignees: K4YT3X
 
 ## Description
 
-Briefly describe the feature you want to be added into `video2x`.
+Briefly describe the feature that you'd like Video2X to have.
 
 ## Sources
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master, ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 4 * * 5'
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -1,3 +1,6 @@
+# QtCreator
+video2x_gui.pyproject.user
+
 # PyCharm
 .idea/
 

Dockerfile

@@ -7,181 +7,25 @@
 # Last Modified: May 24, 2020
 
 # Editor: K4YT3X
-# Last Modified: May 30, 2020
+# Last Modified: June 13, 2020
 
+# using Ubuntu LTS 19.10
+# Ubuntu 20.x is incompatible with Nvidia libraries
 FROM ubuntu:19.10
-#FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
 
+# file mainainter labels
 LABEL maintainer="Danielle Douglas <ddouglas87@gmail.com>"
 LABEL maintainer="Lhanjian <lhjay1@foxmail.com>"
 LABEL maintainer="K4YT3X <k4yt3x@k4yt3x.com>"
 
-# Don't ask questions during image setup.
+# run installation
-ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update \
-ENV NASM_VERSION 2.14
+    && apt-get install -y git-core \
-ENV NVCODEC_VERSION 8.2.15.6
+    && git clone --recurse-submodules --progress https://github.com/k4yt3x/video2x.git /tmp/video2x/video2x \
-ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig
+    && bash -e /tmp/video2x/video2x/src/video2x_setup_ubuntu.sh /
-ENV FFMPEG_VERSION 4.1.2
-
-# Install apt-fast, because we got gigs to download.
-RUN apt-get update && apt-get install -y apt-utils &&\
-    apt-get install -y --no-install-recommends software-properties-common &&\
-    add-apt-repository ppa:apt-fast/stable &&\
-    add-apt-repository -y ppa:graphics-drivers/ppa &&\
-    apt-get install -y --no-install-recommends apt-fast && apt-fast update
-
-# Install dependencies
-RUN apt-fast install -y --no-install-recommends autoconf ca-certificates curl ffmpeg frei0r-plugins-dev g++ gcc git-core gnupg2 gnutls-dev ladspa-sdk libass-dev libass-dev libbluray-dev libc6-dev libcaca-dev libcdio-paranoia-dev libchromaprint-dev libcodec2-dev libfdk-aac-dev libfdk-aac-dev libfontconfig1-dev libfreetype6-dev libfreetype6-dev libfreetype6-dev libfribidi-dev libgme-dev libgnutls28-dev libgsm1-dev libjack-dev libjack-dev liblilv-dev libmagic-dev libmagic1 libmodplug-dev libmp3lame-dev libmp3lame-dev libmysofa-dev libnuma-dev libopenal-dev libopencore-amrnb-dev libopencore-amrwb-dev libopenjp2-7-dev libopenmpt-dev libopus-dev libopus-dev libpulse-dev librsvg2-dev librtmp-dev librubberband-dev libsdl2-dev libsdl2-dev libshine-dev libsmbclient-dev libsnappy-dev libsoxr-dev libspeex-dev libssh-dev libtesseract-dev libtheora-dev libtool libtwolame-dev libv4l-dev libva-dev libva-dev libvdpau-dev libvdpau-dev libvo-amrwbenc-dev libvorbis-dev libvorbis-dev libvorbis-dev libvpx-dev libvpx-dev libwavpack-dev libwebp-dev libx264-dev libx264-dev libx265-dev libx265-dev libxcb-shm0-dev libxcb-shm0-dev libxcb-xfixes0-dev libxcb-xfixes0-dev libxcb1-dev libxcb1-dev libxml2-dev libxvidcore-dev libzmq3-dev libzvbi-dev nvidia-cuda-toolkit nvidia-driver-440 opencl-dev p11-kit pkg-config pkg-config python3-dev python3-pip python3-setuptools python3-wheel python3.8 texinfo texinfo wget wget yasm zlib1g-dev zlib1g-dev
-
-# Install NASM
-RUN curl -vfsSLO https://www.nasm.us/pub/nasm/releasebuilds/$NASM_VERSION/nasm-$NASM_VERSION.tar.bz2 \
-    && tar -xjf nasm-$NASM_VERSION.tar.bz2 \
-    && cd nasm-$NASM_VERSION \
-    && ./autogen.sh \
-    && ./configure \
-    && make -j$(nproc) \
-    && make install
-
-# Compile FFmpeg with CUDA support
-
-RUN git clone --recurse-submodules -b n$NVCODEC_VERSION --depth 1 https://git.videolan.org/git/ffmpeg/nv-codec-headers \
-    && cd nv-codec-headers \
-    && make install
-
-RUN curl -vfsSLO https://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2 \
-    && tar -xjf ffmpeg-$FFMPEG_VERSION.tar.bz2 \
-    && cd ffmpeg-$FFMPEG_VERSION \
-    && ./configure --enable-cuda-sdk --enable-cuvid --enable-nonfree --enable-libnpp --enable-nvenc \
-    --enable-gpl --enable-version3 \
-    --enable-small --enable-avisynth --enable-chromaprint \
-    --enable-frei0r --enable-gmp --enable-gnutls --enable-ladspa \
-    --enable-libass --enable-libcaca --enable-libcdio \
-    --enable-libcodec2 --enable-libfontconfig --enable-libfreetype \
-    --enable-libfribidi --enable-libgme --enable-libgsm --enable-libjack \
-    --enable-libmodplug --enable-libmp3lame --enable-libopencore-amrnb \
-    --enable-libopencore-amrwb --enable-libopencore-amrwb \
-    --enable-libopenjpeg --enable-libopenmpt --enable-libopus --enable-libpulse \
-    --enable-librsvg --enable-librubberband --enable-librtmp --enable-libshine \
-    --enable-libsnappy --enable-libsoxr --enable-libspeex \
-    --enable-libssh --enable-libtesseract --enable-libtheora \
-    --enable-libtwolame --enable-libv4l2 --enable-libvo-amrwbenc \
-    --enable-libvorbis --enable-libvpx --enable-libwavpack --enable-libwebp \
-    --enable-libx264 --enable-libx265 --enable-libxvid --enable-libxml2 \
-    --enable-libzmq --enable-libzvbi --enable-lv2 \
-    --enable-libmysofa \
-    --enable-openal --enable-opencl --enable-opengl --enable-libdrm \
-    --enable-libfdk-aac --enable-libbluray \
-    && make -j$(nproc) \
-    && make install
-
-# Add Nvidia's machine-learning repository for libcudnn7 and libcudnn7-dev
-RUN curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub | apt-key add - &&\
-    echo "deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64 /" > /etc/apt/sources.list.d/nvidia-ml.list
-
-# Install Video2X
-RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1 && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 2
-RUN cd / && python3.8 -m pip install --upgrade pip &&\
-    git clone --recurse-submodules --progress https://github.com/k4yt3x/video2x.git --depth=1 &&\
-    python3.8 -m pip install -U -r video2x/src/requirements.txt
-
-# Compile drivers
-
-# example: docker build -t video2x . --build-arg driver=waifu2x_ncnn_vulkan
-ARG driver=all
-
-# Check if driver exists.
-SHELL ["/bin/bash", "-c"]
-RUN drivers=(all waifu2x_caffe waifu2x_converter waifu2x_ncnn_vulkan) &&\
-    case ${drivers[@]} in (*${driver,,}*) true ;; (*)\
-    echo "ERROR: Unrecognized driver." >&2 &&\
-    printf "%s " "Choices are: ${drivers[@]}" >&2 | printf "\n" >&2 &&\
-    exit 1 ;;\
-    esac
-
-RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_caffe" ] ; then \
-    # nagadomi/caffe prerequisites
-    apt-fast update &&\
-    apt-fast install -y --no-install-recommends build-essential cmake libboost-system-dev libboost-thread-dev libboost-filesystem-dev libboost-chrono-dev libboost-date-time-dev libboost-atomic-dev libboost-python-dev libprotobuf-dev protobuf-compiler libhdf5-dev liblmdb-dev libleveldb-dev libsnappy-dev libopencv-dev libatlas-base-dev python-numpy libgflags-dev libgoogle-glog-dev &&\
-    # nagadomi/waifu2x-caffee-ubuntu prerequisites
-    apt-fast install -y --no-install-recommends libboost-iostreams-dev;\
-    fi
-# build waifu2x-caffe && install caffe
-RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_caffe" ] ; then \
-    git clone --recurse-submodules --depth=1 --progress --recurse-submodules https://github.com/nagadomi/waifu2x-caffe-ubuntu.git &&\
-    cd waifu2x-caffe-ubuntu &&\
-    git clone --recurse-submodules --progress --depth=1 https://github.com/nagadomi/caffe.git;\
-    fi
-
-RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_caffe" ] ; then \
-    apt-fast install --no-install-recommends -y gcc-8 libcudnn7 libcudnn7-dev &&\
-    apt-get remove -y gcc g++ &&\
-    ln -s /usr/bin/gcc-8 /usr/bin/gcc && ln -s /usr/bin/g++-8 /usr/bin/g++ &&\
-    cd /waifu2x-caffe-ubuntu &&\
-    mkdir build &&\
-    cd build &&\
-    cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&\
-    make -j$(nproc) install;\
-    fi
-
-RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_caffe" ] ; then \
-    # install waifu2x-caffe
-    cd /waifu2x-caffe-ubuntu/build &&\
-    cp waifu2x-caffe ../bin/ &&\
-    mv ../bin tempname &&\
-    mv tempname /video2x/ &&\
-    mv /video2x/tempname /video2x/waifu2x-caffe &&\
-    rm -rf ../waifu2x-caffe-ubuntu ;\
-    fi
-
-RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_ncnn_vulkan" ] ; then \
-    apt-fast install -y --no-install-recommends software-properties-common build-essential cmake libvulkan-dev glslang-tools libprotobuf-dev protobuf-compiler &&\
-    git clone --recurse-submodules --depth=1 --progress https://github.com/Tencent/ncnn.git &&\
-    cd ncnn &&\
-    mkdir -p build &&\
-    cd build &&\
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DNCNN_VULKAN=ON .. &&\
-    make -j$(nproc) install &&\
-    rm -rf ../../ncnn &&\
-    cd / &&\
-    # Compile waifu2x-ncnn-vulkan
-    git clone --recurse-submodules --depth=1 --progress https://github.com/nihui/waifu2x-ncnn-vulkan.git &&\
-    cd waifu2x-ncnn-vulkan &&\
-    mkdir -p build &&\
-    cd build &&\
-    cmake ../src &&\
-    make -j$(nproc) &&\
-    # Incall waifu2x-ncnn-vulkan
-    cd /waifu2x-ncnn-vulkan &&\
-    mkdir waifu2x-ncnn-vulkan &&\
-    mv models/models-cunet waifu2x-ncnn-vulkan/ &&\
-    mv build/waifu2x-ncnn-vulkan waifu2x-ncnn-vulkan/ &&\
-    mv waifu2x-ncnn-vulkan /video2x/ &&\
-    rm -rf ../waifu2x-ncnn-vulkan ;\
-    fi
-
-RUN if [ "$driver" = "all" ] || [ "$driver" = "waifu2x_converter" ] ;\
-    then \
-    # Prerequisits for waifu2x-converter-cpp
-    apt-fast install -y --no-install-recommends build-essential cmake libopencv-dev ocl-icd-opencl-dev &&\
-    # Compile & Install
-    git clone --recurse-submodules --depth=1 --progress https://github.com/DeadSix27/waifu2x-converter-cpp &&\
-    cd waifu2x-converter-cpp &&\
-    mkdir build &&\
-    cd build &&\
-    cmake .. &&\
-    make -j$(nproc) &&\
-    #ldconfig &&\
-    cp -r ../models_rgb ./&&\
-    cd / ;\
-    fi
-
-# Go!
-#COPY entrypoint.sh /
-#ENTRYPOINT ["/entrypoint.sh"]
 
 WORKDIR /host
-ENTRYPOINT ["python3", "/video2x/src/video2x.py"]
+ENTRYPOINT ["python3.8", "/video2x/src/video2x.py"]
 
 ENV NVIDIA_DRIVER_CAPABILITIES all
-# Docker image can ask questions now, if needed.
 ENV DEBIAN_FRONTEND teletype

README.md

@@ -14,23 +14,29 @@
 
 ### Official Discussion Group (Telegram): https://t.me/video2x
 
-## [Download Stable/Beta Builds](https://github.com/k4yt3x/video2x/releases) (Windows)
+## [Download Stable/Beta Builds](https://github.com/k4yt3x/video2x/releases/latest) (Windows)
 
 - **`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.
 
 Go to the **[Quick Start](#quick-start)** section for usages.
 
-### [Download From Mirror](https://files.k4yt3x.com/Projects/Video2X/)
+### [Download From Mirror](https://files.k4yt3x.com/Projects/Video2X/latest)
 
 In case you're unable to download the releases directly from GitHub, you can try downloading from the mirror site hosted by the author. Only releases will be updated in this directory, not nightly builds.
 
 ## [Download Nightly Builds](https://github.com/k4yt3x/video2x/actions) (Windows)
 
+**You need to be logged into GitHub to be able to download GitHub Actions artifacts.**
+
 Nightly builds are built automatically every time a new commit is pushed to the master branch. The lates nightly build is always up-to-date with the latest version of the code, but is less stable and may contain bugs. Nightly builds are handled by GitHub's integrated CI/CD tool, GitHub Actions.
 
 To download the latest nightly build, go to the [GitHub Actions](https://github.com/k4yt3x/video2x/actions) tab, enter the last run of workflow "Video2X Nightly Build, and download the artifacts generated from the run.
 
+## [Docker Image](https://hub.docker.com/r/k4yt3x/video2x)
+
+Video2X Docker images are available on Docker Hub for easy and rapid Video2X deployment on Linux and macOS. If you already have Docker installed, then only one command is needed to start upscaling a video. For more information on how to use Video2X's Docker image, please refer to the [documentations](https://github.com/K4YT3X/video2x/wiki/Docker).
+
 ## Introduction
 
 Video2X is a video/GIF/image upscaling software based on Waifu2X, Anime4K, SRMD and RealSR written in Python 3. It upscales videos, GIFs and images, restoring details from low-resolution inputs. Video2X also accepts GIF input to video output and video input to GIF output.
@@ -182,10 +188,10 @@ python video2x.py -d waifu2x_caffe -- --help
 
 ### Running Video2X (Docker)
 
-Video2X can be deployed via Docker.
+Video2X can be deployed via Docker. The following command upscales the video `sample_input.mp4` two times with Waifu2X NCNN Vulkan and outputs the upscaled video to `sample_output.mp4`. For more details on Video2X Docker image usages, please refer to the [documentations](https://github.com/K4YT3X/video2x/wiki/Docker).
 
 ```shell
-docker pull k4yt3x/video2x
+docker run --rm -it --gpus all -v /dev/dri:/dev/dri -v $PWD:/host k4yt3x/video2x:4.6.0 -d waifu2x_ncnn_vulkan -r 2 -i sample_input.mp4 -o sample_output.mp4
 ```
 
 ---
@@ -237,7 +243,7 @@ Are you interested in how the idea of Video2X was born? Do you want to know the
 ### --log LOG
     log file path (default: program_directory\video2x_%Y-%m-%d_%H-%M-%S.log)
 
-### --nolog
+### --disable_logging
     disable logging (default: False)
 
 ### -v, --version

src/README.md

@@ -0,0 +1,21 @@
+# Directory Listing
+
+- [**images**](images): image assets such as executable icons
+- [**locale**](locale): language locale files (.po, .mo)
+- [**pyinstaller**](pyinstaller): PyInstaller-specific files
+- [**wrappers**](wrappers): binary Python wrappers/bindings
+- [**bilogger.py**](bilogger.py): bidirectional logger
+- [**build.ps1**](build.ps1): release building script
+- [**exceptions.py**](exceptions.py): custom exceptions
+- [**image_cleaner.py**](image_cleaner.py): upscaled images cleaner
+- [**progress_monitor.py**](progress_monitor.py): upscaling progress monitor
+- [**requirements.txt**](requirements.txt): Python requirements for pip
+- [**upscaler.py**](upscaler.py): main upscaler class
+- [**video2x.pot**](video2x.pot): project i18n POT translation file
+- [**video2x.py**](video2x.py): command line interface
+- [**video2x.yaml**](video2x.yaml): configuration file
+- [**video2x_gui.py**](video2x_gui.py): graphical user interface
+- [**video2x_gui.pyproject**](video2x_gui.pyproject): QtCreator project file
+- [**video2x_gui.ui**](video2x_gui.ui): GUI UI file (defines GUI layout)
+- [**video2x_setup.py**](video2x_setup.py): automatic setup script for Windows
+- [**video2x_setup_ubuntu.sh**](video2x_setup_ubuntu.sh): automatic setup script for Ubuntu

src/bilogger.py

@@ -4,12 +4,11 @@
 Creator: Video2X Bidirectional Logger
 Author: K4YT3X
 Date Created: June 4, 2020
-Last Modified: June 4, 2020
+Last Modified: September 13, 2020
 """
 
 # built-in imports
 import _io
-import pathlib
 
 
 class BiLogger(object):
@@ -19,15 +18,15 @@ class BiLogger(object):
     Original code from: https://stackoverflow.com/a/14906787
     """
 
-    def __init__(self, terminal: _io.TextIOWrapper, logfile: pathlib.Path):
+    def __init__(self, terminal: _io.TextIOWrapper, log_file: _io.BufferedRandom):
         """ initialize BiLogger
 
         Args:
             terminal (_io.TextIOWrapper): original terminal IO wrapper
-            logfile (pathlib.Path): target log file path object
+            logfile (_io.BufferedRandom): log file wrapper
         """
         self.terminal = terminal
-        self.log = logfile.open(mode='a+')
+        self.log_file = log_file
 
     def write(self, message: str):
         """ write message to original terminal output and log file
@@ -37,8 +36,8 @@ class BiLogger(object):
         """
         self.terminal.write(message)
         self.terminal.flush()
-        self.log.write(message)
+        self.log_file.write(message)
-        self.log.flush()
+        self.log_file.flush()
 
     def flush(self):
         """ flush logger (for compability only)

src/generate_pot.ps1

@@ -0,0 +1,14 @@
+<#
+Name: Video2X Generate POT Script
+Creator: K4YT3X
+Date Created: September 12, 2020
+Last Modified: September 12, 2020
+
+Description: A PowerShell script that uses Python's pygettext
+script to generate the POT file for translations.
+
+To start a PowerShell session with execution policy bypass
+powershell -ExecutionPolicy Bypass
+#>
+
+python $env:LOCALAPPDATA\Programs\Python\Python38\Tools\i18n\pygettext.py -d video2x *.py wrappers\*.py

src/locale/zh_CN/LC_MESSAGES/zh_CN.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-05-22 17:51-0400\n"
+"POT-Creation-Date: 2020-09-14 14:24-0400\n"
-"PO-Revision-Date: 2020-05-22 17:54-0400\n"
+"PO-Revision-Date: 2020-09-14 14:24-0400\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: zh_CN\n"
@@ -14,230 +14,278 @@ 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.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: progress_monitor.py:42
+#: progress_monitor.py:37
-msgid "Upscaling Progress"
+msgid "Processing: {} (pass {}/{})"
-msgstr "放大进度"
+msgstr "正在处理：{}（进度）"
 
-#: upscaler.py:110
+#: upscaler.py:149
 msgid "Specified or default cache directory is a file/link"
 msgstr "指定或默认的缓存目录是文件/链接"
 
-#: upscaler.py:116
+#: upscaler.py:155
 msgid "Creating cache directory {}"
 msgstr "创建缓存目录 {}"
 
-#: upscaler.py:119
+#: upscaler.py:158
 msgid "Unable to create {}"
 msgstr "无法创建 {}"
 
-#: upscaler.py:124
+#: upscaler.py:163
 msgid "Extracted frames are being saved to: {}"
 msgstr "提取的帧将被保存到：{}"
 
-#: upscaler.py:126
+#: upscaler.py:165
 msgid "Upscaled frames are being saved to: {}"
 msgstr "已放大的帧将被保存到：{}"
 
-#: upscaler.py:136
+#: upscaler.py:175
 msgid "Cleaning up cache directory: {}"
 msgstr "清理缓存目录：{}"
 
-#: upscaler.py:141
+#: upscaler.py:180
 msgid "Unable to delete: {}"
 msgstr "无法删除：{}"
 
-#: upscaler.py:147 upscaler.py:162 upscaler.py:173
+#: upscaler.py:186 upscaler.py:201 upscaler.py:212
 msgid "Input and output path type mismatch"
 msgstr "输入和输出路径类型不匹配"
 
-#: upscaler.py:148
+#: upscaler.py:187
 msgid "Input is multiple files but output is not directory"
 msgstr "输入是多个文件，但输出不是目录"
 
-#: upscaler.py:152
+#: upscaler.py:191
 msgid "Input path {} is neither a file nor a directory"
 msgstr "输入路径 {} 既不是文件也不是目录"
 
-#: upscaler.py:156 upscaler.py:178
+#: upscaler.py:195 upscaler.py:217
 msgid "Input directory and output directory cannot be the same"
 msgstr "输入目录和输出目录不能相同"
 
-#: upscaler.py:163
+#: upscaler.py:202
 msgid "Input is single file but output is directory"
 msgstr "所选的输入路径是单个文件，但输出路径是目录"
 
-#: upscaler.py:166
+#: upscaler.py:205
 msgid "No suffix found in output file path"
 msgstr "在输出文件路径中未找到后缀"
 
-#: upscaler.py:167
+#: upscaler.py:206
 msgid "Suffix must be specified"
 msgstr "必须指定文件后缀"
 
-#: upscaler.py:174
+#: upscaler.py:213
 msgid "Input is directory but output is existing single file"
 msgstr "输入是目录，但输出是现有的单个文件"
 
-#: upscaler.py:183
+#: upscaler.py:222
 msgid "Input path is neither a file nor a directory"
 msgstr "输入路径既不是文件也不是目录"
 
-#: upscaler.py:192
+#: upscaler.py:231
 msgid "FFmpeg or FFprobe cannot be found under the specified path"
 msgstr "在指定的路径下找不到 FFmpeg 或 FFprobe"
 
-#: upscaler.py:193 upscaler.py:203
+#: upscaler.py:232 upscaler.py:242
 msgid "Please check the configuration file settings"
 msgstr "请检查配置文件设置"
 
-#: upscaler.py:202
+#: upscaler.py:241
 msgid "Specified driver executable directory doesn't exist"
 msgstr "指定驱动的可执行文件不存在"
 
-#: upscaler.py:229
+#: upscaler.py:268
 msgid "Failed to parse driver argument: {}"
 msgstr "解析驱动程序参数失败：{}"
 
-#: upscaler.py:261
+#: upscaler.py:288
 msgid "Unrecognized driver: {}"
 msgstr "无法识别的驱动名称：{}"
 
-#: upscaler.py:301
+#: upscaler.py:328
 msgid "Starting progress monitor"
 msgstr "启动进度监视器"
 
-#: upscaler.py:306
+#: upscaler.py:333
 msgid "Starting upscaled image cleaner"
 msgstr "启动已放大图像清理程序"
 
-#: upscaler.py:315 upscaler.py:332
+#: upscaler.py:342 upscaler.py:359
 msgid "Killing progress monitor"
 msgstr "终结进度监视器"
 
-#: upscaler.py:318 upscaler.py:335
+#: upscaler.py:345 upscaler.py:362
 msgid "Killing upscaled image cleaner"
 msgstr "终结已放大图像清理程序"
 
-#: upscaler.py:339
+#: upscaler.py:366
 msgid "Terminating all processes"
 msgstr "正在终止所有进程"
 
-#: upscaler.py:346
+#: upscaler.py:373
 msgid "Main process waiting for subprocesses to exit"
 msgstr "主进程开始等待子进程结束"
 
-#: upscaler.py:365 upscaler.py:369
+#: upscaler.py:392 upscaler.py:396
 msgid "Subprocess {} exited with code {}"
 msgstr "子进程 {} 结束，返回码 {}"
 
-#: upscaler.py:375
+#: upscaler.py:402
 msgid "Stop signal received"
 msgstr "收到停止信号"
 
-#: upscaler.py:380
+#: upscaler.py:407
 msgid "Subprocess execution ran into an error"
 msgstr "子进程执行遇到错误"
 
-#: upscaler.py:410
+#: upscaler.py:437
 msgid "Loading files into processing queue"
 msgstr "正在将文件添加到处理队列中"
 
-#: upscaler.py:415
+#: upscaler.py:438
-msgid "Loading files from multiple paths"
-msgstr "正在从多个路径中导入文件"
-
-#: upscaler.py:416 upscaler.py:435 upscaler.py:442
 msgid "Input path(s): {}"
 msgstr "输入路径：{}"
 
-#: upscaler.py:434
+#: upscaler.py:484
-msgid "Loading single file"
+msgid "File MIME type: {}"
-msgstr "正在导入单个文件"
+msgstr "文件 MIME 类型：{}"
 
-#: upscaler.py:441
+#: upscaler.py:500
-msgid "Loading files from directory"
-msgstr "正在从文件夹中导入文件"
-
-#: upscaler.py:455
-msgid "Loaded files into processing queue"
-msgstr "文件已添加到处理队列"
-
-#: upscaler.py:458
-msgid "Input file: {}"
-msgstr "输入文件：{}"
-
-#: upscaler.py:485
-msgid "Starting to upscale image"
-msgstr "开始放大图像"
-
-#: upscaler.py:488 upscaler.py:550
-msgid "Upscaling completed"
-msgstr "放大完成"
-
-#: upscaler.py:502
-msgid "Reading video information"
-msgstr "读取视频信息"
-
-#: upscaler.py:516
-msgid "Aborting: No video stream found"
-msgstr "程序中止：文件中未找到视频流"
-
-#: upscaler.py:521
-msgid "Framerate: {}"
-msgstr "帧率：{}"
-
-#: upscaler.py:538
-msgid "Unsupported pixel format: {}"
-msgstr "不支持的像素格式：{}"
-
-#: upscaler.py:548
-msgid "Starting to upscale extracted frames"
-msgstr "开始对提取的帧进行放大"
-
-#: upscaler.py:555
 msgid "File {} ({}) neither an image nor a video"
 msgstr "文件 {} （{}） 既不是图片也不是视频"
 
-#: upscaler.py:556
+#: upscaler.py:501
 msgid "Skipping this file"
 msgstr "将跳过此文件"
 
-#: upscaler.py:566
+#: upscaler.py:526
+msgid "Loaded files into processing queue"
+msgstr "文件已添加到处理队列"
+
+#: upscaler.py:529
+msgid "Input file: {}"
+msgstr "输入文件：{}"
+
+#: upscaler.py:541
+msgid "Reading file information"
+msgstr "正在读取视频信息"
+
+#: upscaler.py:550
+msgid "Starting upscaling image"
+msgstr "开始放大图像"
+
+#: upscaler.py:561
+msgid "Starting upscaling video/GIF"
+msgstr "开始放大视频/GIF"
+
+#: upscaler.py:572
+msgid "Aborting: No video stream found"
+msgstr "程序中止：文件中未找到视频流"
+
+#: upscaler.py:581
+msgid "Getting total number of frames in the file"
+msgstr "正在获取文件中的总帧数"
+
+#: upscaler.py:592
+msgid "Calculating scaling parameters"
+msgstr "正在计算缩放参数"
+
+#: upscaler.py:656
+msgid "Framerate: {}"
+msgstr "帧率：{}"
+
+#: upscaler.py:657
+msgid "Width: {}"
+msgstr "宽：{}"
+
+#: upscaler.py:658
+msgid "Height: {}"
+msgstr "高：{}"
+
+#: upscaler.py:659
+msgid "Total number of frames: {}"
+msgstr "总帧数：{}"
+
+#: upscaler.py:660
+msgid "Output width: {}"
+msgstr "输出宽度：{}"
+
+#: upscaler.py:661
+msgid "Output height: {}"
+msgstr "输出高度：{}"
+
+#: upscaler.py:662
+msgid "Required scale ratio: {}"
+msgstr "需要的缩放比例：{}"
+
+#: upscaler.py:663
+msgid "Upscaling jobs queue: {}"
+msgstr "放大工作队列：{}"
+
+#: upscaler.py:680
+msgid "Unsupported pixel format: {}"
+msgstr "不支持的像素格式：{}"
+
+#: upscaler.py:684
+msgid "Starting to upscale extracted frames"
+msgstr "开始对提取的帧进行放大"
+
+#: upscaler.py:701
+msgid "Upscaling completed"
+msgstr "放大完成"
+
+#: upscaler.py:702
+msgid "Average processing speed: {} seconds per frame"
+msgstr "平均处理速度：{} 秒每帧"
+
+#: upscaler.py:705
+msgid "Lanczos downscaling frames"
+msgstr "正在使用 Lanczos 算法缩放图像"
+
+#: upscaler.py:710
+msgid "Downscaling"
+msgstr "正在缩放图像"
+
+#: upscaler.py:729
+msgid "Exporting image"
+msgstr "正在导出图像"
+
+#: upscaler.py:739
 msgid "Converting extracted frames into GIF image"
 msgstr "正在将提取的帧转换为 GIF"
 
-#: upscaler.py:570 upscaler.py:579
+#: upscaler.py:743 upscaler.py:752
 msgid "Conversion completed"
 msgstr "转换已完成"
 
-#: upscaler.py:575
+#: upscaler.py:748
 msgid "Converting extracted frames into video"
 msgstr "正在将提取的帧转换为视频"
 
-#: upscaler.py:583
+#: upscaler.py:756
 msgid "Migrating audio, subtitles and other streams to upscaled video"
 msgstr "正在将音频、字幕和其他流迁移到放大后的视频"
 
-#: upscaler.py:593
+#: upscaler.py:766
 msgid "Failed to migrate streams"
 msgstr "迁移流失败"
 
-#: upscaler.py:594
+#: upscaler.py:767
 msgid "Trying to output video without additional streams"
 msgstr "正在尝试输出不含其他流的视频"
 
-#: upscaler.py:610
+#: upscaler.py:783
 msgid "Output video file exists"
 msgstr "输出目标文件已存在"
 
-#: upscaler.py:614
+#: upscaler.py:787
 msgid "Created temporary directory to contain file"
 msgstr "为文件创建了临时目录"
 
-#: upscaler.py:617
+#: upscaler.py:790
 msgid "Writing intermediate file to: {}"
 msgstr "正在将中间视频文件写入至：{}"
 
@@ -265,66 +313,101 @@ msgstr "Video2X 选项"
 msgid "show this help message and exit"
 msgstr "显示此帮助消息并退出"
 
-#: video2x.py:110
+#: video2x.py:116
 msgid "source video file/directory"
 msgstr "源视频文件/目录"
 
-#: video2x.py:111
+#: video2x.py:117
 msgid "output video file/directory"
 msgstr "输出视频文件/目录"
 
-#: video2x.py:112
+#: video2x.py:119
-msgid "video2x config file path"
+msgid "Video2X config file path"
-msgstr "video2x 配置文件路径"
+msgstr "Video2X 配置文件路径"
 
-#: video2x.py:114
+#: video2x.py:121
+msgid "log file path"
+msgstr "日志文件路径"
+
+#: video2x.py:122
 msgid "display version, lawful information and exit"
 msgstr "显示版本和法律信息并退出"
 
-#: video2x.py:117
+#: video2x.py:125
 msgid "Upscaling Options"
 msgstr "视频放大选项"
 
-#: video2x.py:118
+#: video2x.py:126
-msgid "upscaling driver"
-msgstr "视频放大驱动"
-
-#: video2x.py:119
 msgid "scaling ratio"
 msgstr "缩放比"
 
-#: video2x.py:120
+#: video2x.py:127
+msgid "output width"
+msgstr "输出宽度"
+
+#: video2x.py:128
+msgid "output height"
+msgstr "输出高度"
+
+#: video2x.py:129
+msgid "upscaling driver"
+msgstr "视频放大驱动"
+
+#: video2x.py:130
 msgid "number of processes to use for upscaling"
 msgstr "并发进程数"
 
-#: video2x.py:121
+#: video2x.py:131
 msgid "preserve extracted and upscaled frames"
 msgstr "保留提取的和放大的帧"
 
-#: video2x.py:161
+#: video2x.py:171
 msgid "This file cannot be imported"
 msgstr "此文件无法被当作模块导入"
 
-#: video2x.py:236
+#: video2x.py:187
+msgid "Specify either scaling ratio or scaling resolution, not both"
+msgstr "您只能指定缩放比或输出分辨率两者之一"
+
+#: video2x.py:273
 msgid "Program completed, taking {} seconds"
 msgstr "程序执行完毕，总计花费 {} 秒"
 
-#: video2x.py:239
+#: video2x.py:277
 msgid "An exception has occurred"
 msgstr "发生了异常"
 
+#: video2x.py:292
+msgid "The error log file can be found at: {}"
+msgstr "错误日志已被保存到：{}"
+
+#~ msgid "disable logging"
+#~ msgstr "禁用日志"
+
+#~ msgid "Only one of scaling width and scaling height is specified"
+#~ msgstr "输出高度和宽度仅有其中一项被指定"
+
+#~ msgid "Redirecting console logs to {}"
+#~ msgstr "将控制台日志重定向到 {}"
+
+#~ msgid "Upscaling Progress"
+#~ msgstr "放大进度"
+
+#~ msgid "Loading files from multiple paths"
+#~ msgstr "正在从多个路径中导入文件"
+
+#~ msgid "Loading single file"
+#~ msgstr "正在导入单个文件"
+
+#~ msgid "Loading files from directory"
+#~ msgstr "正在从文件夹中导入文件"
+
 #~ msgid "Anime4KCPP doesn't yet support GIF processing"
 #~ msgstr "Anime4KCPP 尚不支持GIF处理"
 
 #~ msgid "Starting to upscale video with Anime4KCPP"
 #~ msgstr "开始用 Anime4KCPP 放大视频"
 
-#~ msgid "output video width"
-#~ msgstr "输出视频宽度"
-
-#~ msgid "output video height"
-#~ msgstr "输出视频高度"
-
 #~ msgid "You must specify input video file/directory path"
 #~ msgstr "您必须指定输入视频文件/目录路径"
 
@@ -340,8 +423,5 @@ msgstr "发生了异常"
 #~ 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 "您必须同时指定宽度和高度"

src/progress_monitor.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 """
 Name: Video2X Upscale Progress Monitor
-Author: BrianPetkovsek
+Author: K4YT3X
 Date Created: May 7, 2020
-Last Modified: May 10, 2020
+Last Modified: September 9, 2020
 """
 
 # built-in imports
@@ -34,12 +34,7 @@ class ProgressMonitor(threading.Thread):
     def run(self):
         self.running = True
 
-        # get number of extracted frames
+        with tqdm(total=self.upscaler.total_frames, ascii=True, desc=_('Processing: {} (pass {}/{})').format(self.upscaler.current_input_file.name, self.upscaler.current_pass, len(self.upscaler.scaling_jobs))) as progress_bar:
-        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.
@@ -47,7 +42,7 @@ class ProgressMonitor(threading.Thread):
             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())]
+                    upscaled_frames = [f for f in self.upscaler.upscaled_frames.iterdir() if str(f).lower().endswith(self.upscaler.extracted_frame_format.lower())]
                     if len(upscaled_frames) >= 1:
                         self.upscaler.last_frame_upscaled = sorted(upscaled_frames)[-1]
                     self.upscaler.total_frames_upscaled = len(upscaled_frames)

src/requirements.txt

@@ -1,9 +1,10 @@
 avalon_framework
 colorama
 patool
+pillow
 pyqt5
-python-magic; platform_system != "Windows"
 python-magic-bin; platform_system == "Windows"
+python-magic; platform_system != "Windows"
 pyyaml
 requests
 tqdm

src/upscaler.py

@@ -4,7 +4,7 @@
 Name: Video2X Upscaler
 Author: K4YT3X
 Date Created: December 10, 2018
-Last Modified: June 4, 2020
+Last Modified: September 13, 2020
 
 Description: This file contains the Upscaler class. Each
 instance of the Upscaler class is an upscaler on an image or
@@ -25,6 +25,7 @@ import copy
 import gettext
 import importlib
 import locale
+import math
 import mimetypes
 import pathlib
 import queue
@@ -36,7 +37,9 @@ import time
 import traceback
 
 # third-party imports
+from PIL import Image
 from avalon_framework import Avalon
+from tqdm import tqdm
 import magic
 
 # internationalization constants
@@ -50,7 +53,7 @@ language.install()
 _ = language.gettext
 
 # version information
-UPSCALER_VERSION = '4.2.1'
+UPSCALER_VERSION = '4.4.0'
 
 # these names are consistent for
 # - driver selection in command line
@@ -63,6 +66,14 @@ AVAILABLE_DRIVERS = ['waifu2x_caffe',
                      'realsr_ncnn_vulkan',
                      'anime4kcpp']
 
+# fixed scaling ratios supported by the drivers
+# that only support certain fixed scale ratios
+DRIVER_FIXED_SCALING_RATIOS = {
+    'waifu2x_ncnn_vulkan': [1, 2],
+    'srmd_ncnn_vulkan': [2, 3, 4],
+    'realsr_ncnn_vulkan': [4],
+}
+
 
 class Upscaler:
     """ An instance of this class is a upscaler that will
@@ -73,28 +84,55 @@ class Upscaler:
         ArgumentError -- if argument is not valid
     """
 
-    def __init__(self, input_path, output_path, driver_settings, ffmpeg_settings, gifski_settings):
+    def __init__(
-        # mandatory arguments
+        self,
+        input_path: pathlib.Path or list,
+        output_path: pathlib.Path,
+        driver_settings: dict,
+        ffmpeg_settings: dict,
+        gifski_settings: dict,
+        driver: str = 'waifu2x_caffe',
+        scale_ratio: float = None,
+        scale_width: int = None,
+        scale_height: int = None,
+        processes: int = 1,
+        video2x_cache_directory: pathlib.Path = pathlib.Path(tempfile.gettempdir()) / 'video2x',
+        extracted_frame_format: str = 'png',
+        output_file_name_format_string: str = '{original_file_name}_output{extension}',
+        image_output_extension: str = '.png',
+        video_output_extension: str = '.mp4',
+        preserve_frames: bool = False
+    ):
+
+        # required parameters
         self.input = input_path
         self.output = output_path
         self.driver_settings = driver_settings
         self.ffmpeg_settings = ffmpeg_settings
         self.gifski_settings = gifski_settings
 
-        # optional arguments
+        # optional parameters
-        self.driver = 'waifu2x_caffe'
+        self.driver = driver
-        self.scale_ratio = None
+        self.scale_ratio = scale_ratio
-        self.processes = 1
+        self.scale_width = scale_width
-        self.video2x_cache_directory = pathlib.Path(tempfile.gettempdir()) / 'video2x'
+        self.scale_height = scale_height
-        self.image_format = 'png'
+        self.processes = processes
-        self.preserve_frames = False
+        self.video2x_cache_directory = video2x_cache_directory
+        self.extracted_frame_format = extracted_frame_format
+        self.output_file_name_format_string = output_file_name_format_string
+        self.image_output_extension = image_output_extension
+        self.video_output_extension = video_output_extension
+        self.preserve_frames = preserve_frames
 
         # other internal members and signals
         self.running = False
+        self.current_processing_starting_time = time.time()
         self.total_frames_upscaled = 0
         self.total_frames = 0
         self.total_files = 0
         self.total_processed = 0
+        self.scaling_jobs = []
+        self.current_pass = 0
         self.current_input_file = pathlib.Path()
         self.last_frame_upscaled = pathlib.Path()
 
@@ -230,31 +268,19 @@ class Upscaler:
             Avalon.error(_('Failed to parse driver argument: {}').format(e.args[0]))
             raise e
 
-        # waifu2x-caffe scale_ratio, scale_width and scale_height check
+    def _upscale_frames(self, input_directory: pathlib.Path, output_directory: pathlib.Path):
-        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
 
         This function upscales all the frames extracted
         by ffmpeg using the waifu2x-caffe binary.
 
-        Arguments:
+        Args:
-            w2 {Waifu2x Object} -- initialized waifu2x object
+            input_directory (pathlib.Path): directory containing frames to upscale
+            output_directory (pathlib.Path): directory which upscaled frames should be exported to
+
+        Raises:
+            UnrecognizedDriverError: raised when the given driver is not recognized
+            e: re-raised exception after an exception has been captured and finished processing in this scope
         """
 
         # initialize waifu2x driver
@@ -262,7 +288,7 @@ class Upscaler:
             raise UnrecognizedDriverError(_('Unrecognized driver: {}').format(self.driver))
 
         # list all images in the extracted frames
-        frames = [(self.extracted_frames / f) for f in self.extracted_frames.iterdir() if f.is_file]
+        frames = [(input_directory / f) for f in input_directory.iterdir() if f.is_file]
 
         # if we have less images than processes,
         # create only the processes necessary
@@ -273,7 +299,7 @@ class Upscaler:
         # name into a list
         process_directories = []
         for process_id in range(self.processes):
-            process_directory = self.extracted_frames / str(process_id)
+            process_directory = input_directory / str(process_id)
             process_directories.append(process_directory)
 
             # delete old directories and create new directories
@@ -283,7 +309,7 @@ class Upscaler:
 
         # waifu2x-converter-cpp will perform multi-threading within its own process
         if self.driver in ['waifu2x_converter_cpp', 'waifu2x_ncnn_vulkan', 'srmd_ncnn_vulkan', 'realsr_ncnn_vulkan', 'anime4kcpp']:
-            process_directories = [self.extracted_frames]
+            process_directories = [input_directory]
 
         else:
             # evenly distribute images into each directory
@@ -296,7 +322,7 @@ class Upscaler:
 
         # 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))
+            self.process_pool.append(self.driver_object.upscale(process_directory, output_directory))
 
         # start progress bar in a different thread
         Avalon.debug_info(_('Starting progress monitor'))
@@ -305,7 +331,7 @@ class Upscaler:
 
         # create the clearer and start it
         Avalon.debug_info(_('Starting upscaled image cleaner'))
-        self.image_cleaner = ImageCleaner(self.extracted_frames, self.upscaled_frames, len(self.process_pool))
+        self.image_cleaner = ImageCleaner(input_directory, output_directory, len(self.process_pool))
         self.image_cleaner.start()
 
         # wait for all process to exit
@@ -323,11 +349,11 @@ class Upscaler:
         # 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()]:
+            for image in [f for f in output_directory.iterdir() if f.is_file()]:
-                renamed = re.sub(f'_\\[.*\\]\\[x(\\d+(\\.\\d+)?)\\]\\.{self.image_format}',
+                renamed = re.sub(f'_\\[.*\\]\\[x(\\d+(\\.\\d+)?)\\]\\.{self.extracted_frame_format}',
-                                 f'.{self.image_format}',
+                                 f'.{self.extracted_frame_format}',
                                  str(image.name))
-                (self.upscaled_frames / image).rename(self.upscaled_frames / renamed)
+                (output_directory / image).rename(output_directory / renamed)
 
         # upscaling done, kill helper threads
         Avalon.debug_info(_('Killing progress monitor'))
@@ -403,49 +429,93 @@ class Upscaler:
         self.driver_object.load_configurations(self)
 
         # initialize FFmpeg object
-        self.ffmpeg_object = Ffmpeg(self.ffmpeg_settings, image_format=self.image_format)
+        self.ffmpeg_object = Ffmpeg(self.ffmpeg_settings, extracted_frame_format=self.extracted_frame_format)
 
         # define processing queue
         self.processing_queue = queue.Queue()
 
         Avalon.info(_('Loading files into processing queue'))
-
-        # if input is a list of files
-        if isinstance(self.input, list):
-
-            Avalon.info(_('Loading files from multiple paths'))
         Avalon.debug_info(_('Input path(s): {}').format(self.input))
 
-            # make output directory if it doesn't exist
+        # make output directory if the input is a list or a directory
+        if isinstance(self.input, list) or self.input.is_dir():
             self.output.mkdir(parents=True, exist_ok=True)
 
-            for input_path in self.input:
+        input_files = []
 
+        # if input is single directory
+        # put it in a list for compability with the following code
+        if not isinstance(self.input, list):
+            input_paths = [self.input]
+        else:
+            input_paths = self.input
+
+        # flatten directories into file paths
+        for input_path in input_paths:
+
+            # if the input path is a single file
+            # add the file's path object to input_files
             if input_path.is_file():
-                    output_path = self.output / input_path.name
+                input_files.append(input_path)
-                    self.processing_queue.put((input_path.absolute(), output_path.absolute()))
 
+            # if the input path is a directory
+            # add all files under the directory into the input_files (non-recursive)
             elif input_path.is_dir():
-                    for input_path in [f for f in input_path.iterdir() if f.is_file()]:
+                input_files.extend([f for f in input_path.iterdir() if f.is_file()])
-                        output_path = self.output / input_path.name
-                        self.processing_queue.put((input_path.absolute(), output_path.absolute()))
 
-        # if input specified is single file
+        output_paths = []
-        elif self.input.is_file():
-            Avalon.info(_('Loading single file'))
-            Avalon.debug_info(_('Input path(s): {}').format(self.input))
-            self.processing_queue.put((self.input.absolute(), self.output.absolute()))
 
-        # if input specified is a directory
+        for input_path in input_files:
-        elif self.input.is_dir():
 
-            Avalon.info(_('Loading files from directory'))
+            # get file type
-            Avalon.debug_info(_('Input path(s): {}').format(self.input))
+            # try python-magic if it's available
-            # make output directory if it doesn't exist
+            try:
-            self.output.mkdir(parents=True, exist_ok=True)
+                input_file_mime_type = magic.from_file(str(input_path.absolute()), mime=True)
-            for input_path in [f for f in self.input.iterdir() if f.is_file()]:
+                input_file_type = input_file_mime_type.split('/')[0]
-                output_path = self.output / input_path.name
+                input_file_subtype = input_file_mime_type.split('/')[1]
-                self.processing_queue.put((input_path.absolute(), output_path.absolute()))
+            except Exception:
+
+                # in case python-magic fails to detect file type
+                # try guessing file mime type with mimetypes
+                input_file_mime_type = mimetypes.guess_type(input_path.name)[0]
+                input_file_type = input_file_mime_type.split('/')[0]
+                input_file_subtype = input_file_mime_type.split('/')[1]
+
+            Avalon.debug_info(_('File MIME type: {}').format(input_file_mime_type))
+
+            # set default output file suffixes
+            # if image type is GIF, default output suffix is also .gif
+            if input_file_mime_type == 'image/gif':
+                output_path = self.output / self.output_file_name_format_string.format(original_file_name=input_path.stem, extension='.gif')
+
+            elif input_file_type == 'image':
+                output_path = self.output / self.output_file_name_format_string.format(original_file_name=input_path.stem, extension=self.image_output_extension)
+
+            elif input_file_type == 'video':
+                output_path = self.output / self.output_file_name_format_string.format(original_file_name=input_path.stem, extension=self.video_output_extension)
+
+            # if file is none of: image, image/gif, video
+            # skip to the next task
+            else:
+                Avalon.error(_('File {} ({}) neither an image nor a video').format(input_path, input_file_mime_type))
+                Avalon.warning(_('Skipping this file'))
+                continue
+
+            # if there is only one input file
+            # do not modify output file suffix
+            if isinstance(self.input, pathlib.Path) and self.input.is_file():
+                output_path = self.output
+
+            output_path_id = 0
+            while str(output_path) in output_paths:
+                output_path = output_path.parent / pathlib.Path(f'{output_path.stem}_{output_path_id}{output_path.suffix}')
+                output_path_id += 1
+
+            # record output path
+            output_paths.append(str(output_path))
+
+            # push file information into processing queue
+            self.processing_queue.put((input_path.absolute(), output_path.absolute(), input_file_mime_type, input_file_type, input_file_subtype))
 
         # check argument sanity before running
         self._check_arguments()
@@ -461,56 +531,38 @@ class Upscaler:
         try:
             while not self.processing_queue.empty():
 
-                # reset current processing progress for new job
-                self.total_frames_upscaled = 0
-                self.total_frames = 0
-
                 # get new job from queue
-                self.current_input_file, output_path = self.processing_queue.get()
+                self.current_input_file, output_path, input_file_mime_type, input_file_type, input_file_subtype = self.processing_queue.get()
 
-                # get file type
+                # get current job starting time for GUI calculations
-                try:
+                self.current_processing_starting_time = time.time()
-                    input_file_mime_type = magic.from_file(str(self.current_input_file.absolute()), mime=True)
-                    input_file_type = input_file_mime_type.split('/')[0]
-                    input_file_subtype = input_file_mime_type.split('/')[1]
-                except magic.magic.MagicException:
-                    input_file_type = input_file_subtype = None
 
-                # in case python-magic fails to detect file type
+                # get video information JSON using FFprobe
-                # try guessing file mime type with mimetypes
+                Avalon.info(_('Reading file information'))
-                if input_file_type not in ['image', 'video']:
+                file_info = self.ffmpeg_object.probe_file_info(self.current_input_file)
-                    input_file_mime_type = mimetypes.guess_type(self.current_input_file.name)[0]
+
-                    input_file_type = input_file_mime_type.split('/')[0]
+                # create temporary directories for storing frames
-                    input_file_subtype = input_file_mime_type.split('/')[1]
+                self.create_temp_directories()
 
                 # start handling input
                 # if input file is a static image
                 if input_file_type == 'image' and input_file_subtype != 'gif':
-                    Avalon.info(_('Starting to upscale image'))
+                    Avalon.info(_('Starting upscaling image'))
-                    self.process_pool.append(self.driver_object.upscale(self.current_input_file, output_path))
-                    self._wait()
-                    Avalon.info(_('Upscaling completed'))
 
-                    # static images don't require GIF or video encoding
+                    # copy original file into the pre-processing directory
-                    # go to the next task
+                    shutil.copy(self.current_input_file, self.extracted_frames / self.current_input_file.name)
-                    self.processing_queue.task_done()
-                    self.total_processed += 1
-                    continue
 
-                # if input file is a image/gif file or a video
+                    width = int(file_info['streams'][0]['width'])
-                elif input_file_mime_type == 'image/gif' or input_file_type == 'video':
+                    height = int(file_info['streams'][0]['height'])
+                    framerate = self.total_frames = 1
 
-                    self.create_temp_directories()
+                # elif input_file_mime_type == 'image/gif' or input_file_type == 'video':
-
+                else:
-                    # get video information JSON using FFprobe
+                    Avalon.info(_('Starting upscaling video/GIF'))
-                    Avalon.info(_('Reading video information'))
-                    video_info = self.ffmpeg_object.probe_file_info(self.current_input_file)
-                    # analyze original video with FFprobe and retrieve framerate
-                    # width, height = info['streams'][0]['width'], info['streams'][0]['height']
 
                     # find index of video stream
                     video_stream_index = None
-                    for stream in video_info['streams']:
+                    for stream in file_info['streams']:
                         if stream['codec_type'] == 'video':
                             video_stream_index = stream['index']
                             break
@@ -521,11 +573,97 @@ class Upscaler:
                         raise StreamNotFoundError('no video stream found')
 
                     # get average frame rate of video stream
-                    framerate = float(Fraction(video_info['streams'][video_stream_index]['r_frame_rate']))
+                    framerate = float(Fraction(file_info['streams'][video_stream_index]['r_frame_rate']))
-                    Avalon.info(_('Framerate: {}').format(framerate))
+                    width = int(file_info['streams'][video_stream_index]['width'])
-                    # self.ffmpeg_object.pixel_format = video_info['streams'][video_stream_index]['pix_fmt']
+                    height = int(file_info['streams'][video_stream_index]['height'])
+
+                    # get total number of frames
+                    Avalon.info(_('Getting total number of frames in the file'))
+
+                    # if container stores total number of frames in nb_frames, fetch it directly
+                    if 'nb_frames' in file_info['streams'][video_stream_index]:
+                        self.total_frames = int(file_info['streams'][video_stream_index]['nb_frames'])
+
+                    # otherwise call FFprobe to count the total number of frames
+                    else:
+                        self.total_frames = self.ffmpeg_object.get_number_of_frames(self.current_input_file, video_stream_index)
+
+                # calculate scale width/height/ratio and scaling jobs if required
+                Avalon.info(_('Calculating scaling parameters'))
+
+                # create a local copy of the global output settings
+                output_scale = self.scale_ratio
+                output_width = self.scale_width
+                output_height = self.scale_height
+
+                # calculate output width and height if scale ratio is specified
+                if output_scale is not None:
+                    output_width = int(math.ceil(width * output_scale / 2.0) * 2)
+                    output_height = int(math.ceil(height * output_scale / 2.0) * 2)
+
+                else:
+                    # scale keeping aspect ratio is only one of width/height is given
+                    if output_width == 0 or output_width is None:
+                        output_width = output_height / height * width
+
+                    elif output_height == 0 or output_height is None:
+                        output_height = output_width / width * height
+
+                    output_width = int(math.ceil(output_width / 2.0) * 2)
+                    output_height = int(math.ceil(output_height / 2.0) * 2)
+
+                    # calculate required minimum scale ratio
+                    output_scale = max(output_width / width, output_height / height)
+
+                # if driver is one of the drivers that doesn't support arbitrary scaling ratio
+                # TODO: more documentations on this block
+                if self.driver in DRIVER_FIXED_SCALING_RATIOS:
+
+                    # select the optimal driver scaling ratio to use
+                    supported_scaling_ratios = sorted(DRIVER_FIXED_SCALING_RATIOS[self.driver])
+
+                    remaining_scaling_ratio = math.ceil(output_scale)
+                    self.scaling_jobs = []
+
+                    while remaining_scaling_ratio > 1:
+                        for ratio in supported_scaling_ratios:
+                            if ratio >= remaining_scaling_ratio:
+                                self.scaling_jobs.append(ratio)
+                                remaining_scaling_ratio /= ratio
+                                break
+
+                        else:
+
+                            found = False
+                            for i in supported_scaling_ratios:
+                                for j in supported_scaling_ratios:
+                                    if i * j >= remaining_scaling_ratio:
+                                        self.scaling_jobs.extend([i, j])
+                                        remaining_scaling_ratio /= i * j
+                                        found = True
+                                        break
+                                if found is True:
+                                    break
+
+                            if found is False:
+                                self.scaling_jobs.append(supported_scaling_ratios[-1])
+                                remaining_scaling_ratio /= supported_scaling_ratios[-1]
+
+                else:
+                    self.scaling_jobs = [output_scale]
+
+                # print file information
+                Avalon.debug_info(_('Framerate: {}').format(framerate))
+                Avalon.debug_info(_('Width: {}').format(width))
+                Avalon.debug_info(_('Height: {}').format(height))
+                Avalon.debug_info(_('Total number of frames: {}').format(self.total_frames))
+                Avalon.debug_info(_('Output width: {}').format(output_width))
+                Avalon.debug_info(_('Output height: {}').format(output_height))
+                Avalon.debug_info(_('Required scale ratio: {}').format(output_scale))
+                Avalon.debug_info(_('Upscaling jobs queue: {}').format(self.scaling_jobs))
 
                 # extract frames from video
+                if input_file_mime_type == 'image/gif' or input_file_type == 'video':
                     self.process_pool.append((self.ffmpeg_object.extract_frames(self.current_input_file, self.extracted_frames)))
                     self._wait()
 
@@ -542,34 +680,65 @@ class Upscaler:
                         Avalon.error(_('Unsupported pixel format: {}').format(self.ffmpeg_object.pixel_format))
                         raise UnsupportedPixelError(f'unsupported pixel format {self.ffmpeg_object.pixel_format}')
 
-                    # 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 frames'))
-                    self._upscale_frames()
+                upscale_begin_time = time.time()
-                    Avalon.info(_('Upscaling completed'))
 
-                # if file is none of: image, image/gif, video
+                self.current_pass = 1
-                # skip to the next task
+                if self.driver == 'waifu2x_caffe':
+                    self.driver_object.set_scale_resolution(output_width, output_height)
                 else:
-                    Avalon.error(_('File {} ({}) neither an image nor a video').format(self.current_input_file, input_file_mime_type))
+                    self.driver_object.set_scale_ratio(self.scaling_jobs[0])
-                    Avalon.warning(_('Skipping this file'))
+                self._upscale_frames(self.extracted_frames, self.upscaled_frames)
-                    self.processing_queue.task_done()
+                for job in self.scaling_jobs[1:]:
-                    self.total_processed += 1
+                    self.current_pass += 1
-                    continue
+                    self.driver_object.set_scale_ratio(job)
+                    shutil.rmtree(self.extracted_frames)
+                    shutil.move(self.upscaled_frames, self.extracted_frames)
+                    self.upscaled_frames.mkdir(parents=True, exist_ok=True)
+                    self._upscale_frames(self.extracted_frames, self.upscaled_frames)
+
+                Avalon.info(_('Upscaling completed'))
+                Avalon.info(_('Average processing speed: {} seconds per frame').format(self.total_frames / (time.time() - upscale_begin_time)))
+
+                # downscale frames with Lanczos
+                Avalon.info(_('Lanczos downscaling frames'))
+                shutil.rmtree(self.extracted_frames)
+                shutil.move(self.upscaled_frames, self.extracted_frames)
+                self.upscaled_frames.mkdir(parents=True, exist_ok=True)
+
+                for image in tqdm([i for i in self.extracted_frames.iterdir() if i.is_file() and i.name.endswith(self.extracted_frame_format)], ascii=True, desc=_('Downscaling')):
+                    image_object = Image.open(image)
+
+                    # if the image dimensions are not equal to the output size
+                    # resize the image using Lanczos
+                    if (image_object.width, image_object.height) != (output_width, output_height):
+                        image_object.resize((output_width, output_height), Image.LANCZOS).save(self.upscaled_frames / image.name)
+                        image_object.close()
+
+                    # if the image's dimensions are already equal to the output size
+                    # move image to the finished directory
+                    else:
+                        image_object.close()
+                        shutil.move(image, self.upscaled_frames / image.name)
 
                 # start handling output
                 # output can be either GIF or video
+                if input_file_type == 'image' and input_file_subtype != 'gif':
+
+                    Avalon.info(_('Exporting image'))
+
+                    # there should be only one image in the directory
+                    shutil.move([f for f in self.upscaled_frames.iterdir() if f.is_file()][0], output_path)
+
+                # elif input_file_mime_type == 'image/gif' or input_file_type == 'video':
+                else:
 
                     # if the desired output is gif file
                     if output_path.suffix.lower() == '.gif':
                         Avalon.info(_('Converting extracted frames into GIF image'))
                         gifski_object = Gifski(self.gifski_settings)
-                    self.process_pool.append(gifski_object.make_gif(self.upscaled_frames, output_path, framerate, self.image_format))
+                        self.process_pool.append(gifski_object.make_gif(self.upscaled_frames, output_path, framerate, self.extracted_frame_format, output_width, output_height))
                         self._wait()
                         Avalon.info(_('Conversion completed'))
 

src/video2x.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-22 17:51-0400\n"
+"POT-Creation-Date: 2020-09-14 14:24-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"
@@ -15,227 +15,275 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: progress_monitor.py:42
+#: progress_monitor.py:37
-msgid "Upscaling Progress"
+msgid "Processing: {} (pass {}/{})"
 msgstr ""
 
-#: upscaler.py:110
+#: upscaler.py:149
 msgid "Specified or default cache directory is a file/link"
 msgstr ""
 
-#: upscaler.py:116
+#: upscaler.py:155
 msgid "Creating cache directory {}"
 msgstr ""
 
-#: upscaler.py:119
+#: upscaler.py:158
 msgid "Unable to create {}"
 msgstr ""
 
-#: upscaler.py:124
+#: upscaler.py:163
 msgid "Extracted frames are being saved to: {}"
 msgstr ""
 
-#: upscaler.py:126
+#: upscaler.py:165
 msgid "Upscaled frames are being saved to: {}"
 msgstr ""
 
-#: upscaler.py:136
+#: upscaler.py:175
 msgid "Cleaning up cache directory: {}"
 msgstr ""
 
-#: upscaler.py:141
+#: upscaler.py:180
 msgid "Unable to delete: {}"
 msgstr ""
 
-#: upscaler.py:147 upscaler.py:162 upscaler.py:173
+#: upscaler.py:186 upscaler.py:201 upscaler.py:212
 msgid "Input and output path type mismatch"
 msgstr ""
 
-#: upscaler.py:148
+#: upscaler.py:187
 msgid "Input is multiple files but output is not directory"
 msgstr ""
 
-#: upscaler.py:152
+#: upscaler.py:191
 msgid "Input path {} is neither a file nor a directory"
 msgstr ""
 
-#: upscaler.py:156 upscaler.py:178
+#: upscaler.py:195 upscaler.py:217
 msgid "Input directory and output directory cannot be the same"
 msgstr ""
 
-#: upscaler.py:163
+#: upscaler.py:202
 msgid "Input is single file but output is directory"
 msgstr ""
 
-#: upscaler.py:166
+#: upscaler.py:205
 msgid "No suffix found in output file path"
 msgstr ""
 
-#: upscaler.py:167
+#: upscaler.py:206
 msgid "Suffix must be specified"
 msgstr ""
 
-#: upscaler.py:174
+#: upscaler.py:213
 msgid "Input is directory but output is existing single file"
 msgstr ""
 
-#: upscaler.py:183
+#: upscaler.py:222
 msgid "Input path is neither a file nor a directory"
 msgstr ""
 
-#: upscaler.py:192
+#: upscaler.py:231
 msgid "FFmpeg or FFprobe cannot be found under the specified path"
 msgstr ""
 
-#: upscaler.py:193 upscaler.py:203
+#: upscaler.py:232 upscaler.py:242
 msgid "Please check the configuration file settings"
 msgstr ""
 
-#: upscaler.py:202
+#: upscaler.py:241
 msgid "Specified driver executable directory doesn't exist"
 msgstr ""
 
-#: upscaler.py:229
+#: upscaler.py:268
 msgid "Failed to parse driver argument: {}"
 msgstr ""
 
-#: upscaler.py:261
+#: upscaler.py:288
 msgid "Unrecognized driver: {}"
 msgstr ""
 
-#: upscaler.py:301
+#: upscaler.py:328
 msgid "Starting progress monitor"
 msgstr ""
 
-#: upscaler.py:306
+#: upscaler.py:333
 msgid "Starting upscaled image cleaner"
 msgstr ""
 
-#: upscaler.py:315 upscaler.py:332
+#: upscaler.py:342 upscaler.py:359
 msgid "Killing progress monitor"
 msgstr ""
 
-#: upscaler.py:318 upscaler.py:335
+#: upscaler.py:345 upscaler.py:362
 msgid "Killing upscaled image cleaner"
 msgstr ""
 
-#: upscaler.py:339
+#: upscaler.py:366
 msgid "Terminating all processes"
 msgstr ""
 
-#: upscaler.py:346
+#: upscaler.py:373
 msgid "Main process waiting for subprocesses to exit"
 msgstr ""
 
-#: upscaler.py:365 upscaler.py:369
+#: upscaler.py:392 upscaler.py:396
 msgid "Subprocess {} exited with code {}"
 msgstr ""
 
-#: upscaler.py:375
+#: upscaler.py:402
 msgid "Stop signal received"
 msgstr ""
 
-#: upscaler.py:380
+#: upscaler.py:407
 msgid "Subprocess execution ran into an error"
 msgstr ""
 
-#: upscaler.py:410
+#: upscaler.py:437
 msgid "Loading files into processing queue"
 msgstr ""
 
-#: upscaler.py:415
+#: upscaler.py:438
-msgid "Loading files from multiple paths"
-msgstr ""
-
-#: upscaler.py:416 upscaler.py:435 upscaler.py:442
 msgid "Input path(s): {}"
 msgstr ""
 
-#: upscaler.py:434
+#: upscaler.py:484
-msgid "Loading single file"
+msgid "File MIME type: {}"
 msgstr ""
 
-#: upscaler.py:441
+#: upscaler.py:500
-msgid "Loading files from directory"
-msgstr ""
-
-#: upscaler.py:455
-msgid "Loaded files into processing queue"
-msgstr ""
-
-#: upscaler.py:458
-msgid "Input file: {}"
-msgstr ""
-
-#: upscaler.py:485
-msgid "Starting to upscale image"
-msgstr ""
-
-#: upscaler.py:488 upscaler.py:550
-msgid "Upscaling completed"
-msgstr ""
-
-#: upscaler.py:502
-msgid "Reading video information"
-msgstr ""
-
-#: upscaler.py:516
-msgid "Aborting: No video stream found"
-msgstr ""
-
-#: upscaler.py:521
-msgid "Framerate: {}"
-msgstr ""
-
-#: upscaler.py:538
-msgid "Unsupported pixel format: {}"
-msgstr ""
-
-#: upscaler.py:548
-msgid "Starting to upscale extracted frames"
-msgstr ""
-
-#: upscaler.py:555
 msgid "File {} ({}) neither an image nor a video"
 msgstr ""
 
-#: upscaler.py:556
+#: upscaler.py:501
 msgid "Skipping this file"
 msgstr ""
 
-#: upscaler.py:566
+#: upscaler.py:526
+msgid "Loaded files into processing queue"
+msgstr ""
+
+#: upscaler.py:529
+msgid "Input file: {}"
+msgstr ""
+
+#: upscaler.py:541
+msgid "Reading file information"
+msgstr ""
+
+#: upscaler.py:550
+msgid "Starting upscaling image"
+msgstr ""
+
+#: upscaler.py:561
+msgid "Starting upscaling video/GIF"
+msgstr ""
+
+#: upscaler.py:572
+msgid "Aborting: No video stream found"
+msgstr ""
+
+#: upscaler.py:581
+msgid "Getting total number of frames in the file"
+msgstr ""
+
+#: upscaler.py:592
+msgid "Calculating scaling parameters"
+msgstr ""
+
+#: upscaler.py:656
+msgid "Framerate: {}"
+msgstr ""
+
+#: upscaler.py:657
+msgid "Width: {}"
+msgstr ""
+
+#: upscaler.py:658
+msgid "Height: {}"
+msgstr ""
+
+#: upscaler.py:659
+msgid "Total number of frames: {}"
+msgstr ""
+
+#: upscaler.py:660
+msgid "Output width: {}"
+msgstr ""
+
+#: upscaler.py:661
+msgid "Output height: {}"
+msgstr ""
+
+#: upscaler.py:662
+msgid "Required scale ratio: {}"
+msgstr ""
+
+#: upscaler.py:663
+msgid "Upscaling jobs queue: {}"
+msgstr ""
+
+#: upscaler.py:680
+msgid "Unsupported pixel format: {}"
+msgstr ""
+
+#: upscaler.py:684
+msgid "Starting to upscale extracted frames"
+msgstr ""
+
+#: upscaler.py:701
+msgid "Upscaling completed"
+msgstr ""
+
+#: upscaler.py:702
+msgid "Average processing speed: {} seconds per frame"
+msgstr ""
+
+#: upscaler.py:705
+msgid "Lanczos downscaling frames"
+msgstr ""
+
+#: upscaler.py:710
+msgid "Downscaling"
+msgstr ""
+
+#: upscaler.py:729
+msgid "Exporting image"
+msgstr ""
+
+#: upscaler.py:739
 msgid "Converting extracted frames into GIF image"
 msgstr ""
 
-#: upscaler.py:570 upscaler.py:579
+#: upscaler.py:743 upscaler.py:752
 msgid "Conversion completed"
 msgstr ""
 
-#: upscaler.py:575
+#: upscaler.py:748
 msgid "Converting extracted frames into video"
 msgstr ""
 
-#: upscaler.py:583
+#: upscaler.py:756
 msgid "Migrating audio, subtitles and other streams to upscaled video"
 msgstr ""
 
-#: upscaler.py:593
+#: upscaler.py:766
 msgid "Failed to migrate streams"
 msgstr ""
 
-#: upscaler.py:594
+#: upscaler.py:767
 msgid "Trying to output video without additional streams"
 msgstr ""
 
-#: upscaler.py:610
+#: upscaler.py:783
 msgid "Output video file exists"
 msgstr ""
 
-#: upscaler.py:614
+#: upscaler.py:787
 msgid "Created temporary directory to contain file"
 msgstr ""
 
-#: upscaler.py:617
+#: upscaler.py:790
 msgid "Writing intermediate file to: {}"
 msgstr ""
 
@@ -257,51 +305,71 @@ msgstr ""
 msgid "show this help message and exit"
 msgstr ""
 
-#: video2x.py:110
+#: video2x.py:116
 msgid "source video file/directory"
 msgstr ""
 
-#: video2x.py:111
+#: video2x.py:117
 msgid "output video file/directory"
 msgstr ""
 
-#: video2x.py:112
-msgid "video2x config file path"
-msgstr ""
-
-#: video2x.py:114
-msgid "display version, lawful information and exit"
-msgstr ""
-
-#: video2x.py:117
-msgid "Upscaling Options"
-msgstr ""
-
-#: video2x.py:118
-msgid "upscaling driver"
-msgstr ""
-
 #: video2x.py:119
-msgid "scaling ratio"
+msgid "Video2X config file path"
-msgstr ""
-
-#: video2x.py:120
-msgid "number of processes to use for upscaling"
 msgstr ""
 
 #: video2x.py:121
+msgid "log file path"
+msgstr ""
+
+#: video2x.py:122
+msgid "display version, lawful information and exit"
+msgstr ""
+
+#: video2x.py:125
+msgid "Upscaling Options"
+msgstr ""
+
+#: video2x.py:126
+msgid "scaling ratio"
+msgstr ""
+
+#: video2x.py:127
+msgid "output width"
+msgstr ""
+
+#: video2x.py:128
+msgid "output height"
+msgstr ""
+
+#: video2x.py:129
+msgid "upscaling driver"
+msgstr ""
+
+#: video2x.py:130
+msgid "number of processes to use for upscaling"
+msgstr ""
+
+#: video2x.py:131
 msgid "preserve extracted and upscaled frames"
 msgstr ""
 
-#: video2x.py:161
+#: video2x.py:171
 msgid "This file cannot be imported"
 msgstr ""
 
-#: video2x.py:236
+#: video2x.py:187
+msgid "Specify either scaling ratio or scaling resolution, not both"
+msgstr ""
+
+#: video2x.py:273
 msgid "Program completed, taking {} seconds"
 msgstr ""
 
-#: video2x.py:239
+#: video2x.py:277
 msgid "An exception has occurred"
 msgstr ""
 
+#: video2x.py:292
+msgid "The error log file can be found at: {}"
+msgstr ""
+

src/video2x.py

@@ -13,7 +13,7 @@ __      __  _       _                  ___   __   __
 Name: Video2X Controller
 Creator: K4YT3X
 Date Created: Feb 24, 2018
-Last Modified: June 4, 2020
+Last Modified: September 13, 2020
 
 Editor: BrianPetkovsek
 Last Modified: June 17, 2019
@@ -56,7 +56,6 @@ from upscaler import Upscaler
 
 # built-in imports
 import argparse
-import datetime
 import gettext
 import importlib
 import locale
@@ -81,7 +80,7 @@ language = gettext.translation(DOMAIN, LOCALE_DIRECTORY, [default_locale], fallb
 language.install()
 _ = language.gettext
 
-CLI_VERSION = '4.1.0'
+CLI_VERSION = '4.3.1'
 
 LEGAL_INFO = _('''Video2X CLI Version: {}
 Upscaler Version: {}
@@ -107,7 +106,7 @@ def parse_arguments():
 
     # video options
     video2x_options = parser.add_argument_group(_('Video2X Options'))
-    video2x_options.add_argument('-h', '--help', action='help', help=_('show this help message and exit'))
+    video2x_options.add_argument('--help', action='help', help=_('show this help message and exit'))
 
     # if help is in arguments list
     # do not require input and output path to be specified
@@ -117,17 +116,17 @@ def parse_arguments():
     video2x_options.add_argument('-i', '--input', type=pathlib.Path, help=_('source video file/directory'), required=require_input_output)
     video2x_options.add_argument('-o', '--output', type=pathlib.Path, help=_('output video file/directory'), required=require_input_output)
 
-    video2x_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')
-    video2x_options.add_argument('--log', type=pathlib.Path, help=_('log file path'),
+    video2x_options.add_argument('--log', type=pathlib.Path, help=_('log file path'))
-                                 default=pathlib.Path(__file__).parent.absolute() / f'video2x_{datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")}.log')
-    video2x_options.add_argument('--nolog', help=_('disable logging'), action='store_true')
     video2x_options.add_argument('-v', '--version', help=_('display version, lawful information and exit'), action='store_true')
 
     # scaling options
     upscaling_options = parser.add_argument_group(_('Upscaling Options'))
-    upscaling_options.add_argument('-d', '--driver', help=_('upscaling driver'), choices=AVAILABLE_DRIVERS, default='waifu2x_caffe')
+    upscaling_options.add_argument('-r', '--ratio', help=_('scaling ratio'), action='store', type=float)
-    upscaling_options.add_argument('-r', '--ratio', help=_('scaling ratio'), action='store', type=float, default=2.0)
+    upscaling_options.add_argument('-w', '--width', help=_('output width'), action='store', type=float)
+    upscaling_options.add_argument('-h', '--height', help=_('output height'), action='store', type=float)
+    upscaling_options.add_argument('-d', '--driver', help=_('upscaling driver'), choices=AVAILABLE_DRIVERS, default='waifu2x_ncnn_vulkan')
     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')
 
@@ -183,12 +182,21 @@ if video2x_args.version:
     print(LEGAL_INFO)
     sys.exit(0)
 
+# additional checks on upscaling arguments
+if video2x_args.ratio is not None and (video2x_args.width is not None or video2x_args.height is not None):
+    Avalon.error(_('Specify either scaling ratio or scaling resolution, not both'))
+    sys.exit(1)
+
 # redirect output to both terminal and log file
-if video2x_args.nolog is False:
+if video2x_args.log is not None:
-    LOGFILE = video2x_args.log
+    log_file = video2x_args.log.open(mode='a+', encoding='utf-8')
-    Avalon.debug_info(_('Redirecting console logs to {}').format(LOGFILE))
+else:
-    sys.stdout = BiLogger(sys.stdout, LOGFILE)
+    log_file = tempfile.TemporaryFile(mode='a+', suffix='.log', prefix='video2x_', encoding='utf-8')
-    sys.stderr = BiLogger(sys.stderr, LOGFILE)
+
+original_stdout = sys.stdout
+original_stderr = sys.stderr
+sys.stdout = BiLogger(sys.stdout, log_file)
+sys.stderr = BiLogger(sys.stderr, log_file)
 
 # read configurations from configuration file
 config = read_config(video2x_args.config)
@@ -206,7 +214,10 @@ gifski_settings = config['gifski']
 gifski_settings['gifski_path'] = os.path.expandvars(gifski_settings['gifski_path'])
 
 # load video2x settings
-image_format = config['video2x']['image_format'].lower()
+extracted_frame_format = config['video2x']['extracted_frame_format'].lower()
+output_file_name_format_string = config['video2x']['output_file_name_format_string']
+image_output_extension = config['video2x']['image_output_extension']
+video_output_extension = config['video2x']['video_output_extension']
 preserve_frames = config['video2x']['preserve_frames']
 
 # if preserve frames specified in command line
@@ -234,19 +245,27 @@ try:
     begin_time = time.time()
 
     # initialize upscaler object
-    upscaler = Upscaler(input_path=video2x_args.input,
+    upscaler = Upscaler(
+        # required parameters
+        input_path=video2x_args.input,
         output_path=video2x_args.output,
         driver_settings=driver_settings,
         ffmpeg_settings=ffmpeg_settings,
-                        gifski_settings=gifski_settings)
+        gifski_settings=gifski_settings,
 
-    # set upscaler optional options
+        # optional parameters
-    upscaler.driver = video2x_args.driver
+        driver=video2x_args.driver,
-    upscaler.scale_ratio = video2x_args.ratio
+        scale_ratio=video2x_args.ratio,
-    upscaler.processes = video2x_args.processes
+        scale_width=video2x_args.width,
-    upscaler.video2x_cache_directory = video2x_cache_directory
+        scale_height=video2x_args.height,
-    upscaler.image_format = image_format
+        processes=video2x_args.processes,
-    upscaler.preserve_frames = preserve_frames
+        video2x_cache_directory=video2x_cache_directory,
+        extracted_frame_format=extracted_frame_format,
+        output_file_name_format_string=output_file_name_format_string,
+        image_output_extension=image_output_extension,
+        video_output_extension=video_output_extension,
+        preserve_frames=preserve_frames
+    )
 
     # run upscaler
     upscaler.run()
@@ -254,5 +273,25 @@ try:
     Avalon.info(_('Program completed, taking {} seconds').format(round((time.time() - begin_time), 5)))
 
 except Exception:
+
     Avalon.error(_('An exception has occurred'))
     traceback.print_exc()
+
+    if video2x_args.log is not None:
+        log_file_path = video2x_args.log.absolute()
+
+    # if log file path is not specified, create temporary file as permanent log file
+    # tempfile.TempFile does not have a name attribute and is not guaranteed to have
+    # a visible name on the file system
+    else:
+        log_file_path = tempfile.mkstemp(suffix='.log', prefix='video2x_')[1]
+        with open(log_file_path, 'w', encoding='utf-8') as permanent_log_file:
+            log_file.seek(0)
+            permanent_log_file.write(log_file.read())
+
+    Avalon.error(_('The error log file can be found at: {}').format(log_file_path))
+
+finally:
+    sys.stdout = original_stdout
+    sys.stderr = original_stderr
+    log_file.close()

src/video2x.yaml

@@ -1,7 +1,7 @@
 # Name: Video2X Configuration File
 # Creator: K4YT3X
 # Date Created: October 23, 2018
-# Last Modified: May 29, 2020
+# Last Modified: September 13, 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
@@ -18,8 +18,8 @@ waifu2x_caffe:
   output_quality: -1 # output image quality
   process: gpu # <cpu|gpu|cudnn> process mode
   model_dir: null # path to custom model directory (don't append last / )
-  scale_height: 0 # custom scale height (specifying this will overwrite scale_ratio)
+  #scale_height: 0 # custom scale height (specifying this will overwrite scale_ratio)
-  scale_width: 0 # custom scale width (specifying this will overwrite scale_ratio)
+  #scale_width: 0 # custom scale width (specifying this will overwrite scale_ratio)
   #scale_ratio: null # custom scale ratio
   noise_level: 3 # <0|1|2|3> noise reduction level
   mode: noise_scale # <noise|scale|noise_scale|auto_scale> image processing mode
@@ -100,15 +100,22 @@ anime4kcpp:
   fastMode: false # Faster but maybe low quality
   videoMode: false # 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
+  GPUMode: false # Enable GPU acceleration
+  CNNMode: false # Enable ACNet
+  HDN: false # Enable HDN mode for ACNet
+  HDNLevel: 1 # Set HDN level (int [=1])
   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])
+  forceFps: 0 # Set output video fps to the specifying number, 0 to disable (float [=0])
+  disableProgress: false # disable progress display
+  webVideo: null # process the video from URL
+  alpha: false # preserve the Alpha channel for transparent image
 ffmpeg:
   ffmpeg_path: '%LOCALAPPDATA%\video2x\ffmpeg-latest-win64-static\bin'
   intermediate_file_name: 'intermediate.mkv'
@@ -119,7 +126,7 @@ ffmpeg:
     '-y': true
     input_options: {} # empty dict, expand if necessary
     output_options:
-      '-pix_fmt': rgba64be # extracted frames pixel format
+      '-pix_fmt': rgb24 # extracted frames pixel format
       '-qscale:v': null # output image quality control for JPEG (1-31, 1 being highest)
   # Step 2: Video Assembly
   # assemble all frames back into a video with only a video track
@@ -161,12 +168,15 @@ gifski:
   # fps: 20 # Animation frames per second (for PNG frames only) [default: 20]
   fast: false # 3 times faster encoding, but 10% lower quality and bigger file
   quality: 100 # Lower quality may give smaller file
-  width: null # Maximum width
+  #width: null # Maximum width
-  height: null # Maximum height (if width is also set)
+  #height: null # Maximum height (if width is also set)
   once: false # Do not loop the GIF
   nosort: false # Use files exactly in the order given, rather than sorted
   quiet: false # Do not show a progress bar
 video2x:
   video2x_cache_directory: null # default: %TEMP%\video2x, directory where cache files are stored, will be deleted if preserve_frames is not set to true
-  image_format: png # png/jpg intermediate file format used for extracted frames during video processing
+  extracted_frame_format: png # png/jpg intermediate file format used for extracted frames during video processing
+  output_file_name_format_string: "{original_file_name}_output{extension}" # format string to use for generating output file names
+  image_output_extension: .png # image output extension during batch processing
+  video_output_extension: .mp4 # video output extension during batch processing
   preserve_frames: false # if set to true, the cache directory won't be cleaned upon task completion

src/video2x_gui.py

@@ -4,7 +4,7 @@
 Creator: Video2X GUI
 Author: K4YT3X
 Date Created: May 5, 2020
-Last Modified: June 4, 2020
+Last Modified: September 13, 2020
 """
 
 # local imports
@@ -15,7 +15,6 @@ from wrappers.ffmpeg import Ffmpeg
 
 # built-in imports
 import contextlib
-import datetime
 import json
 import mimetypes
 import os
@@ -34,7 +33,7 @@ from PyQt5.QtGui import *
 from PyQt5.QtWidgets import *
 import magic
 
-GUI_VERSION = '2.6.0'
+GUI_VERSION = '2.8.0'
 
 LEGAL_INFO = f'''Video2X GUI Version: {GUI_VERSION}\\
 Upscaler Version: {UPSCALER_VERSION}\\
@@ -52,6 +51,9 @@ AVAILABLE_DRIVERS = {
     'Anime4KCPP': 'anime4kcpp'
 }
 
+# get current working directory before it is changed by drivers
+CWD = pathlib.Path.cwd()
+
 
 def resource_path(relative_path: str) -> pathlib.Path:
     try:
@@ -137,7 +139,7 @@ class InputTableModel(QAbstractTableModel):
                         input_file_mime_type = magic.from_file(str(file_path.absolute()), mime=True)
                         input_file_type = input_file_mime_type.split('/')[0]
                         input_file_subtype = input_file_mime_type.split('/')[1]
-                    except magic.magic.MagicException:
+                    except Exception:
                         input_file_type = input_file_subtype = None
 
                     # in case python-magic fails to detect file type
@@ -192,8 +194,10 @@ class Video2XMainWindow(QMainWindow):
         super().__init__(*args, **kwargs)
         uic.loadUi(str(resource_path('video2x_gui.ui')), self)
 
-        # generate log file name
+        # redirect output to both terminal and log file
-        self.logfile = pathlib.Path(__file__).parent.absolute() / f'video2x_{datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")}.log'
+        self.log_file = tempfile.TemporaryFile(mode='a+', suffix='.log', prefix='video2x_', encoding='utf-8')
+        sys.stdout = BiLogger(sys.stdout, self.log_file)
+        sys.stderr = BiLogger(sys.stderr, self.log_file)
 
         # create thread pool for upscaler workers
         self.threadpool = QThreadPool()
@@ -248,7 +252,7 @@ class Video2XMainWindow(QMainWindow):
         # select output file/folder
         self.output_line_edit = self.findChild(QLineEdit, 'outputLineEdit')
         self.enable_line_edit_file_drop(self.output_line_edit)
-        self.output_line_edit.setText(str((pathlib.Path().cwd() / 'output').absolute()))
+        self.output_line_edit.setText(str((CWD / 'output').absolute()))
         self.output_select_file_button = self.findChild(QPushButton, 'outputSelectFileButton')
         self.output_select_file_button.clicked.connect(self.select_output_file)
         self.output_select_folder_button = self.findChild(QPushButton, 'outputSelectFolderButton')
@@ -257,7 +261,12 @@ class Video2XMainWindow(QMainWindow):
         # config file
         self.config_line_edit = self.findChild(QLineEdit, 'configLineEdit')
         self.enable_line_edit_file_drop(self.config_line_edit)
+
+        if getattr(sys, 'frozen', False):
+            self.config_line_edit.setText(str((pathlib.Path(sys.executable).parent / 'video2x.yaml').absolute()))
+        elif __file__:
             self.config_line_edit.setText(str((pathlib.Path(__file__).parent / 'video2x.yaml').absolute()))
+
         self.config_select_file_button = self.findChild(QPushButton, 'configSelectButton')
         self.config_select_file_button.clicked.connect(self.select_config_file)
 
@@ -272,6 +281,13 @@ class Video2XMainWindow(QMainWindow):
         self.driver_combo_box.currentTextChanged.connect(self.update_gui_for_driver)
         self.processes_spin_box = self.findChild(QSpinBox, 'processesSpinBox')
         self.scale_ratio_double_spin_box = self.findChild(QDoubleSpinBox, 'scaleRatioDoubleSpinBox')
+        self.output_width_spin_box = self.findChild(QSpinBox, 'outputWidthSpinBox')
+        self.output_width_spin_box.valueChanged.connect(self.mutually_exclude_scale_ratio_resolution)
+        self.output_height_spin_box = self.findChild(QSpinBox, 'outputHeightSpinBox')
+        self.output_height_spin_box.valueChanged.connect(self.mutually_exclude_scale_ratio_resolution)
+        self.output_file_name_format_string_line_edit = self.findChild(QLineEdit, 'outputFileNameFormatStringLineEdit')
+        self.image_output_extension_line_edit = self.findChild(QLineEdit, 'imageOutputExtensionLineEdit')
+        self.video_output_extension_line_edit = self.findChild(QLineEdit, 'videoOutputExtensionLineEdit')
         self.preserve_frames_check_box = self.findChild(QCheckBox, 'preserveFramesCheckBox')
 
         # frame preview
@@ -301,8 +317,6 @@ class Video2XMainWindow(QMainWindow):
         self.enable_line_edit_file_drop(self.waifu2x_caffe_path_line_edit)
         self.waifu2x_caffe_path_select_button = self.findChild(QPushButton, 'waifu2xCaffePathSelectButton')
         self.waifu2x_caffe_path_select_button.clicked.connect(lambda: self.select_driver_binary_path(self.waifu2x_caffe_path_line_edit))
-        self.waifu2x_caffe_scale_width_spin_box = self.findChild(QSpinBox, 'waifu2xCaffeScaleWidthSpinBox')
-        self.waifu2x_caffe_scale_height_spin_box = self.findChild(QSpinBox, 'waifu2xCaffeScaleHeightSpinBox')
         self.waifu2x_caffe_mode_combo_box = self.findChild(QComboBox, 'waifu2xCaffeModeComboBox')
         self.waifu2x_caffe_noise_level_spin_box = self.findChild(QSpinBox, 'waifu2xCaffeNoiseLevelSpinBox')
         self.waifu2x_caffe_process_combo_box = self.findChild(QComboBox, 'waifu2xCaffeProcessComboBox')
@@ -385,6 +399,12 @@ class Video2XMainWindow(QMainWindow):
         self.anime4kcpp_pre_processing_check_box = self.findChild(QCheckBox, 'anime4kCppPreProcessingCheckBox')
         self.anime4kcpp_post_processing_check_box = self.findChild(QCheckBox, 'anime4kCppPostProcessingCheckBox')
         self.anime4kcpp_gpu_mode_check_box = self.findChild(QCheckBox, 'anime4kCppGpuModeCheckBox')
+        self.anime4kcpp_cnn_mode_check_box = self.findChild(QCheckBox, 'anime4kCppCnnModeCheckBox')
+        self.anime4kcpp_hdn_check_box = self.findChild(QCheckBox, 'anime4kCppHdnCheckBox')
+        self.anime4kcpp_hdn_level_spin_box = self.findChild(QSpinBox, 'anime4kCppHdnLevelSpinBox')
+        self.anime4kcpp_force_fps_double_spin_box = self.findChild(QDoubleSpinBox, 'anime4kCppForceFpsDoubleSpinBox')
+        self.anime4kcpp_disable_progress_check_box = self.findChild(QCheckBox, 'anime4kCppDisableProgressCheckBox')
+        self.anime4kcpp_alpha_check_box = self.findChild(QCheckBox, 'anime4kCppAlphaCheckBox')
 
         # FFmpeg settings
         # global options
@@ -427,8 +447,6 @@ class Video2XMainWindow(QMainWindow):
         self.gifski_path_line_edit = self.findChild(QLineEdit, 'gifskiPathLineEdit')
         self.enable_line_edit_file_drop(self.gifski_path_line_edit)
         self.gifski_quality_spin_box = self.findChild(QSpinBox, 'gifskiQualitySpinBox')
-        self.gifski_width_spin_box = self.findChild(QSpinBox, 'gifskiWidthSpinBox')
-        self.gifski_height_spin_box = self.findChild(QSpinBox, 'gifskiHeightSpinBox')
         self.gifski_fast_check_box = self.findChild(QCheckBox, 'gifskiFastCheckBox')
         self.gifski_once_check_box = self.findChild(QCheckBox, 'gifskiOnceCheckBox')
         self.gifski_quiet_check_box = self.findChild(QCheckBox, 'gifskiQuietCheckBox')
@@ -466,14 +484,16 @@ class Video2XMainWindow(QMainWindow):
             self.config['video2x']['video2x_cache_directory'] = str((pathlib.Path(tempfile.gettempdir()) / 'video2x').absolute())
         self.cache_line_edit.setText(self.config['video2x']['video2x_cache_directory'])
 
+        self.output_file_name_format_string_line_edit.setText(self.config['video2x']['output_file_name_format_string'])
+        self.image_output_extension_line_edit.setText(self.config['video2x']['image_output_extension'])
+        self.video_output_extension_line_edit.setText(self.config['video2x']['video_output_extension'])
+
         # load preserve frames settings
         self.preserve_frames_check_box.setChecked(self.config['video2x']['preserve_frames'])
         self.start_button.setEnabled(True)
 
         # waifu2x-caffe
         settings = self.config['waifu2x_caffe']
-        self.waifu2x_caffe_scale_width_spin_box.setValue(settings['scale_width'])
-        self.waifu2x_caffe_scale_height_spin_box.setValue(settings['scale_height'])
         self.waifu2x_caffe_path_line_edit.setText(str(pathlib.Path(os.path.expandvars(settings['path'])).absolute()))
         self.waifu2x_caffe_mode_combo_box.setCurrentText(settings['mode'])
         self.waifu2x_caffe_noise_level_spin_box.setValue(settings['noise_level'])
@@ -542,6 +562,12 @@ class Video2XMainWindow(QMainWindow):
         self.anime4kcpp_pre_processing_check_box.setChecked(settings['preprocessing'])
         self.anime4kcpp_post_processing_check_box.setChecked(settings['postprocessing'])
         self.anime4kcpp_gpu_mode_check_box.setChecked(settings['GPUMode'])
+        self.anime4kcpp_cnn_mode_check_box.setChecked(settings['CNNMode'])
+        self.anime4kcpp_hdn_check_box.setChecked(settings['HDN'])
+        self.anime4kcpp_hdn_level_spin_box.setValue(settings['HDNLevel'])
+        self.anime4kcpp_force_fps_double_spin_box.setValue(settings['forceFps'])
+        self.anime4kcpp_disable_progress_check_box.setChecked(settings['disableProgress'])
+        self.anime4kcpp_alpha_check_box.setChecked(settings['alpha'])
 
         # ffmpeg
         # global options
@@ -570,9 +596,6 @@ class Video2XMainWindow(QMainWindow):
         settings = self.config['gifski']
         self.gifski_path_line_edit.setText(str(pathlib.Path(os.path.expandvars(settings['gifski_path'])).absolute()))
         self.gifski_quality_spin_box.setValue(settings['quality'])
-        if isinstance(settings['width'], int) and isinstance(settings['height'], int):
-            self.gifski_width_spin_box.setValue(settings['width'])
-            self.gifski_height_spin_box.setValue(settings['height'])
         self.gifski_fast_check_box.setChecked(settings['fast'])
         self.gifski_once_check_box.setChecked(settings['once'])
         self.gifski_quiet_check_box.setChecked(settings['quiet'])
@@ -580,15 +603,13 @@ class Video2XMainWindow(QMainWindow):
     def resolve_driver_settings(self):
 
         # waifu2x-caffe
-        self.config['waifu2x_caffe']['scale_width'] = self.waifu2x_caffe_scale_width_spin_box.value()
-        self.config['waifu2x_caffe']['scale_height'] = self.waifu2x_caffe_scale_height_spin_box.value()
         self.config['waifu2x_caffe']['path'] = os.path.expandvars(self.waifu2x_caffe_path_line_edit.text())
         self.config['waifu2x_caffe']['mode'] = self.waifu2x_caffe_mode_combo_box.currentText()
         self.config['waifu2x_caffe']['noise_level'] = self.waifu2x_caffe_noise_level_spin_box.value()
         self.config['waifu2x_caffe']['process'] = self.waifu2x_caffe_process_combo_box.currentText()
         self.config['waifu2x_caffe']['model_dir'] = str((pathlib.Path(self.config['waifu2x_caffe']['path']).parent / 'models' / self.waifu2x_caffe_model_combobox.currentText()).absolute())
         self.config['waifu2x_caffe']['crop_size'] = self.waifu2x_caffe_crop_size_spin_box.value()
-        self.config['waifu2x_caffe']['output_quality'] = self.waifu2x_caffe_output_depth_spin_box.value()
+        self.config['waifu2x_caffe']['output_quality'] = self.waifu2x_caffe_output_quality_spin_box.value()
         self.config['waifu2x_caffe']['output_depth'] = self.waifu2x_caffe_output_depth_spin_box.value()
         self.config['waifu2x_caffe']['batch_size'] = self.waifu2x_caffe_batch_size_spin_box.value()
         self.config['waifu2x_caffe']['gpu'] = self.waifu2x_caffe_gpu_spin_box.value()
@@ -650,6 +671,12 @@ class Video2XMainWindow(QMainWindow):
         self.config['anime4kcpp']['preprocessing'] = bool(self.anime4kcpp_pre_processing_check_box.isChecked())
         self.config['anime4kcpp']['postprocessing'] = bool(self.anime4kcpp_post_processing_check_box.isChecked())
         self.config['anime4kcpp']['GPUMode'] = bool(self.anime4kcpp_gpu_mode_check_box.isChecked())
+        self.config['anime4kcpp']['CNNMode'] = bool(self.anime4kcpp_cnn_mode_check_box.isChecked())
+        self.config['anime4kcpp']['HDN'] = bool(self.anime4kcpp_hdn_check_box.isChecked())
+        self.config['anime4kcpp']['HDNLevel'] = self.anime4kcpp_hdn_level_spin_box.value()
+        self.config['anime4kcpp']['forceFps'] = self.anime4kcpp_force_fps_double_spin_box.value()
+        self.config['anime4kcpp']['disableProgress'] = bool(self.anime4kcpp_disable_progress_check_box.isChecked())
+        self.config['anime4kcpp']['alpha'] = bool(self.anime4kcpp_alpha_check_box.isChecked())
 
         # ffmpeg
         self.config['ffmpeg']['ffmpeg_path'] = os.path.expandvars(self.ffmpeg_path_line_edit.text())
@@ -711,7 +738,8 @@ class Video2XMainWindow(QMainWindow):
 
         self.config['ffmpeg']['migrate_streams']['output_options']['-pix_fmt'] = self.ffmpeg_migrate_streams_output_options_pixel_format_line_edit.text()
 
-        if (fps := self.ffmpeg_migrate_streams_output_options_frame_interpolation_spin_box.value()) > 0:
+        fps = self.ffmpeg_migrate_streams_output_options_frame_interpolation_spin_box.value()
+        if fps > 0:
             if ('-vf' in self.config['ffmpeg']['migrate_streams']['output_options'] and
                     len(self.config['ffmpeg']['migrate_streams']['output_options']['-vf']) > 0 and
                     'minterpolate=' not in self.config['ffmpeg']['migrate_streams']['output_options']['-vf']):
@@ -748,12 +776,6 @@ class Video2XMainWindow(QMainWindow):
         # Gifski
         self.config['gifski']['gifski_path'] = os.path.expandvars(self.gifski_path_line_edit.text())
         self.config['gifski']['quality'] = self.gifski_quality_spin_box.value()
-        if self.gifski_width_spin_box.value() > 0 and self.gifski_height_spin_box.value() > 0:
-            self.config['gifski']['width'] = self.gifski_width_spin_box.value()
-            self.config['gifski']['height'] = self.gifski_height_spin_box.value()
-        else:
-            self.config['gifski']['width'] = None
-            self.config['gifski']['height'] = None
         self.config['gifski']['fast'] = self.gifski_fast_check_box.isChecked()
         self.config['gifski']['once'] = self.gifski_once_check_box.isChecked()
         self.config['gifski']['quiet'] = self.gifski_quiet_check_box.isChecked()
@@ -800,6 +822,12 @@ class Video2XMainWindow(QMainWindow):
         with open(config_file, 'r') as config:
             return yaml.load(config, Loader=yaml.FullLoader)
 
+    def mutually_exclude_scale_ratio_resolution(self):
+        if self.output_width_spin_box.value() != 0 or self.output_height_spin_box.value() != 0:
+            self.scale_ratio_double_spin_box.setDisabled(True)
+        elif self.output_width_spin_box.value() == 0 and self.output_height_spin_box.value() == 0:
+            self.scale_ratio_double_spin_box.setDisabled(False)
+
     def mutually_exclude_frame_interpolation_stream_copy(self):
         if self.ffmpeg_migrate_streams_output_options_frame_interpolation_spin_box.value() > 0:
             self.ffmpeg_migrate_streams_output_options_copy_streams_check_box.setChecked(False)
@@ -811,24 +839,6 @@ class Video2XMainWindow(QMainWindow):
     def update_gui_for_driver(self):
         current_driver = AVAILABLE_DRIVERS[self.driver_combo_box.currentText()]
 
-        # update scale ratio constraints
-        if current_driver in ['waifu2x_caffe', 'waifu2x_converter_cpp', 'anime4kcpp']:
-            self.scale_ratio_double_spin_box.setMinimum(0.0)
-            self.scale_ratio_double_spin_box.setMaximum(999.0)
-            self.scale_ratio_double_spin_box.setValue(2.0)
-        elif current_driver == 'waifu2x_ncnn_vulkan':
-            self.scale_ratio_double_spin_box.setMinimum(1.0)
-            self.scale_ratio_double_spin_box.setMaximum(2.0)
-            self.scale_ratio_double_spin_box.setValue(2.0)
-        elif current_driver == 'srmd_ncnn_vulkan':
-            self.scale_ratio_double_spin_box.setMinimum(2.0)
-            self.scale_ratio_double_spin_box.setMaximum(4.0)
-            self.scale_ratio_double_spin_box.setValue(2.0)
-        elif current_driver == 'realsr_ncnn_vulkan':
-            self.scale_ratio_double_spin_box.setMinimum(4.0)
-            self.scale_ratio_double_spin_box.setMaximum(4.0)
-            self.scale_ratio_double_spin_box.setValue(4.0)
-
         # update preferred processes/threads count
         if current_driver == 'anime4kcpp':
             self.processes_spin_box.setValue(16)
@@ -873,6 +883,12 @@ class Video2XMainWindow(QMainWindow):
             return None
         return pathlib.Path(folder_selected)
 
+    def select_save_file(self, *args, **kwargs) -> pathlib.Path:
+        save_file_selected = QFileDialog.getSaveFileName(self, *args, **kwargs)
+        if not isinstance(save_file_selected, tuple) or save_file_selected[0] == '':
+            return None
+        return pathlib.Path(save_file_selected[0])
+
     def update_output_path(self):
         # if input list is empty
         # clear output path
@@ -882,7 +898,7 @@ class Video2XMainWindow(QMainWindow):
         # if there are multiple output files
         # use cwd/output directory for output
         elif len(self.input_table_data) > 1:
-            self.output_line_edit.setText(str((pathlib.Path.cwd() / 'output').absolute()))
+            self.output_line_edit.setText(str((CWD / 'output').absolute()))
 
         # if there's only one input file
         # generate output file/directory name automatically
@@ -899,7 +915,7 @@ class Video2XMainWindow(QMainWindow):
                     input_file_mime_type = magic.from_file(str(input_path.absolute()), mime=True)
                     input_file_type = input_file_mime_type.split('/')[0]
                     input_file_subtype = input_file_mime_type.split('/')[1]
-                except magic.magic.MagicException:
+                except Exception:
                     input_file_type = input_file_subtype = None
 
                 # in case python-magic fails to detect file type
@@ -918,25 +934,25 @@ class Video2XMainWindow(QMainWindow):
 
                     # otherwise, use .png by default for all images
                     else:
-                        suffix = '.png'
+                        suffix = self.image_output_extension_line_edit.text()
 
                 # if input is video, use .mp4 as output by default
                 elif input_file_type == 'video':
-                    suffix = '.mp4'
+                    suffix = self.video_output_extension_line_edit.text()
 
                 # if failed to detect file type
                 # use input file's suffix
                 else:
                     suffix = input_path.suffix
 
-                output_path = input_path.parent / f'{input_path.stem}_output{suffix}'
+                output_path = input_path.parent / self.output_file_name_format_string_line_edit.text().format(original_file_name=input_path.stem, extension=suffix)
 
             elif input_path.is_dir():
-                output_path = input_path.parent / f'{input_path.stem}_output'
+                output_path = input_path.parent / self.output_file_name_format_string_line_edit.text().format(original_file_name=input_path.stem, extension='')
 
-            # try up to 1000 times
+            # try a new name with a different file ID
             output_path_id = 0
-            while output_path.exists() and output_path_id <= 1000:
+            while output_path.exists():
                 if input_path.is_file():
                     output_path = input_path.parent / pathlib.Path(f'{input_path.stem}_output_{output_path_id}{suffix}')
                 elif input_path.is_dir():
@@ -947,44 +963,49 @@ class Video2XMainWindow(QMainWindow):
                 self.output_line_edit.setText(str(output_path.absolute()))
 
     def select_input_file(self):
-        if ((input_file := self.select_file('Select Input File')) is None or
+        input_file = self.select_file('Select Input File')
-                self.input_table_path_exists(input_file)):
+        if (input_file is None or self.input_table_path_exists(input_file)):
             return
         self.input_table_data.append(input_file)
         self.update_output_path()
         self.update_input_table()
 
     def select_input_folder(self):
-        if ((input_folder := self.select_folder('Select Input Folder')) is None or
+        input_folder = self.select_folder('Select Input Folder')
-                self.input_table_path_exists(input_folder)):
+        if (input_folder is None or self.input_table_path_exists(input_folder)):
             return
         self.input_table_data.append(input_folder)
         self.update_output_path()
         self.update_input_table()
 
     def select_output_file(self):
-        if (output_file := self.select_file('Select Output File')) is None:
+        output_file = self.select_file('Select Output File')
+        if output_file is None:
             return
         self.output_line_edit.setText(str(output_file.absolute()))
 
     def select_output_folder(self):
-        if (output_folder := self.select_folder('Select Output Folder')) is None:
+        output_folder = self.select_folder('Select Output Folder')
+        if output_folder is None:
             return
         self.output_line_edit.setText(str(output_folder.absolute()))
 
     def select_cache_folder(self):
-        if (cache_folder := self.select_folder('Select Cache Folder')) is None:
+        cache_folder = self.select_folder('Select Cache Folder')
+        if cache_folder is None:
             return
         self.cache_line_edit.setText(str(cache_folder.absolute()))
 
     def select_config_file(self):
-        if (config_file := self.select_file('Select Config File', filter='(YAML files (*.yaml))')) is None:
+        config_file = self.select_file('Select Config File', filter='(YAML files (*.yaml))')
+        if config_file is None:
             return
         self.config_line_edit.setText(str(config_file.absolute()))
         self.load_configurations()
 
     def select_driver_binary_path(self, driver_line_edit: QLineEdit):
-        if (driver_binary_path := self.select_file('Select Driver Binary File')) is None:
+        driver_binary_path = self.select_file('Select Driver Binary File')
+        if driver_binary_path is None:
             return
         driver_line_edit.setText(str(driver_binary_path.absolute()))
 
@@ -1024,6 +1045,16 @@ class Video2XMainWindow(QMainWindow):
         message_box.exec_()
 
     def show_error(self, exception: Exception):
+
+        def _process_button_press(button_pressed):
+            # if the user pressed the save button, save log file to destination
+            if button_pressed.text() == 'Save':
+                log_file_saving_path = self.select_save_file('Select Log File Saving Destination', 'video2x_error.log')
+                if log_file_saving_path is not None:
+                    with open(log_file_saving_path, 'w', encoding='utf-8') as log_file:
+                        self.log_file.seek(0)
+                        log_file.write(self.log_file.read())
+
         # QErrorMessage(self).showMessage(message.replace('\n', '<br>'))
         message_box = QMessageBox(self)
         message_box.setWindowTitle('Error')
@@ -1032,48 +1063,63 @@ class Video2XMainWindow(QMainWindow):
 
         error_message = '''Upscaler ran into an error:\\
 {}\\
-Check the console output for details.\\
+Check the console output or the log file for details.\\
-When reporting an error, please include console output.\\
 You can [submit an issue on GitHub](https://github.com/k4yt3x/video2x/issues/new?assignees=K4YT3X&labels=bug&template=bug-report.md&title={}) to report this error.\\
-It\'s also highly recommended for you to attach the [log file]({}) under the programs\'s parent folder named {}.'''
+It\'s highly recommended to attach the log file.\\
-        message_box.setText(error_message.format(exception, urllib.parse.quote(str(exception)), self.logfile.as_uri(), self.logfile.name))
+You can click \"Save\" to save the log file.'''
+        message_box.setText(error_message.format(exception, urllib.parse.quote(str(exception))))
+
+        message_box.setStandardButtons(QMessageBox.Save | QMessageBox.Close)
+        message_box.setDefaultButton(QMessageBox.Save)
+        message_box.buttonClicked.connect(_process_button_press)
         message_box.exec_()
 
     def progress_monitor(self, progress_callback: pyqtSignal):
 
         # initialize progress bar values
-        upscale_begin_time = time.time()
+        progress_callback.emit((time.time(), 0, 0, 0, 0, 0, [], pathlib.Path(), pathlib.Path()))
-        progress_callback.emit((upscale_begin_time, 0, 0, 0, 0, pathlib.Path(), pathlib.Path()))
 
         # keep querying upscaling process and feed information to callback signal
         while self.upscaler.running:
 
-            progress_callback.emit((upscale_begin_time,
+            progress_callback.emit((self.upscaler.current_processing_starting_time,
                                     self.upscaler.total_frames_upscaled,
                                     self.upscaler.total_frames,
                                     self.upscaler.total_processed,
                                     self.upscaler.total_files,
+                                    self.upscaler.current_pass,
+                                    self.upscaler.scaling_jobs,
                                     self.upscaler.current_input_file,
                                     self.upscaler.last_frame_upscaled))
             time.sleep(1)
 
         # upscale process will stop at 99%
         # so it's set to 100 manually when all is done
-        progress_callback.emit((upscale_begin_time, 0, 0, 0, 0, pathlib.Path(), pathlib.Path()))
+        progress_callback.emit((time.time(),
+                                self.upscaler.total_frames,
+                                self.upscaler.total_frames,
+                                self.upscaler.total_files,
+                                self.upscaler.total_files,
+                                len(self.upscaler.scaling_jobs),
+                                self.upscaler.scaling_jobs,
+                                pathlib.Path(),
+                                pathlib.Path()))
 
     def set_progress(self, progress_information: tuple):
-        upscale_begin_time = progress_information[0]
+        current_processing_starting_time = progress_information[0]
         total_frames_upscaled = progress_information[1]
         total_frames = progress_information[2]
         total_processed = progress_information[3]
         total_files = progress_information[4]
-        current_input_file = progress_information[5]
+        current_pass = progress_information[5]
-        last_frame_upscaled = progress_information[6]
+        scaling_jobs = progress_information[6]
+        current_input_file = progress_information[7]
+        last_frame_upscaled = progress_information[8]
 
         # calculate fields based on frames and time elapsed
-        time_elapsed = time.time() - upscale_begin_time
+        time_elapsed = time.time() - current_processing_starting_time
         try:
-            rate = total_frames_upscaled / (time.time() - upscale_begin_time)
+            rate = total_frames_upscaled / time_elapsed
             time_remaining = (total_frames - total_frames_upscaled) / rate
         except Exception:
             rate = 0.0
@@ -1089,7 +1135,7 @@ It\'s also highly recommended for you to attach the [log file]({}) under the pro
         self.overall_progress_label.setText('Overall Progress: {}/{}'.format(total_processed, total_files))
         self.overall_progress_bar.setMaximum(total_files)
         self.overall_progress_bar.setValue(total_processed)
-        self.currently_processing_label.setText('Currently Processing: {}'.format(str(current_input_file.name)))
+        self.currently_processing_label.setText('Currently Processing: {} (pass {}/{})'.format(str(current_input_file.name), current_pass, len(scaling_jobs)))
 
         # if show frame is checked, show preview image
         if self.frame_preview_show_preview_check_box.isChecked() and last_frame_upscaled.is_file():
@@ -1140,10 +1186,6 @@ It\'s also highly recommended for you to attach the [log file]({}) under the pro
                 self.show_warning('Output path unspecified')
                 return
 
-            print(f'Redirecting console logs to {self.logfile}', file=sys.stderr)
-            sys.stdout = BiLogger(sys.stdout, self.logfile)
-            sys.stderr = BiLogger(sys.stderr, self.logfile)
-
             if len(self.input_table_data) == 1:
                 input_directory = self.input_table_data[0]
             else:
@@ -1158,19 +1200,36 @@ It\'s also highly recommended for you to attach the [log file]({}) under the pro
             # load driver settings for the current driver
             self.driver_settings = self.config[AVAILABLE_DRIVERS[self.driver_combo_box.currentText()]]
 
-            self.upscaler = Upscaler(input_path=input_directory,
+            # get scale ratio or resolution
+            if self.scale_ratio_double_spin_box.isEnabled():
+                scale_ratio = self.scale_ratio_double_spin_box.value()
+                scale_width = scale_height = None
+
+            else:
+                scale_ratio = None
+                scale_width = self.output_width_spin_box.value()
+                scale_height = self.output_height_spin_box.value()
+
+            self.upscaler = Upscaler(
+                # required parameters
+                input_path=input_directory,
                 output_path=output_directory,
                 driver_settings=self.driver_settings,
                 ffmpeg_settings=self.ffmpeg_settings,
-                                     gifski_settings=self.gifski_settings)
+                gifski_settings=self.gifski_settings,
 
-            # set optional options
+                # optional parameters
-            self.upscaler.driver = AVAILABLE_DRIVERS[self.driver_combo_box.currentText()]
+                driver=AVAILABLE_DRIVERS[self.driver_combo_box.currentText()],
-            self.upscaler.scale_ratio = self.scale_ratio_double_spin_box.value()
+                scale_ratio=scale_ratio,
-            self.upscaler.processes = self.processes_spin_box.value()
+                scale_width=scale_width,
-            self.upscaler.video2x_cache_directory = pathlib.Path(os.path.expandvars(self.cache_line_edit.text()))
+                scale_height=scale_height,
-            self.upscaler.image_format = self.config['video2x']['image_format'].lower()
+                processes=self.processes_spin_box.value(),
-            self.upscaler.preserve_frames = bool(self.preserve_frames_check_box.isChecked())
+                video2x_cache_directory=pathlib.Path(os.path.expandvars(self.cache_line_edit.text())),
+                extracted_frame_format=self.config['video2x']['extracted_frame_format'].lower(),
+                image_output_extension=self.image_output_extension_line_edit.text(),
+                video_output_extension=self.video_output_extension_line_edit.text(),
+                preserve_frames=bool(self.preserve_frames_check_box.isChecked())
+            )
 
             # run upscaler
             worker = UpscalerWorker(self.upscaler.run)
@@ -1192,6 +1251,10 @@ It\'s also highly recommended for you to attach the [log file]({}) under the pro
             self.upscale_errored(e)
 
     def upscale_errored(self, exception: Exception):
+        # send stop signal in case it's not triggered
+        with contextlib.suppress(AttributeError):
+            self.upscaler.running = False
+
         self.show_error(exception)
         self.threadpool.waitForDone(5)
         self.start_button.setEnabled(True)

src/video2x_gui.pyproject.user

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.0, 2020-05-26T06:35:20. -->
-<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_gui.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>673</width>
+    <width>737</width>
-    <height>844</height>
+    <height>1020</height>
    </rect>
   </property>
   <property name="acceptDrops">
@@ -31,7 +31,22 @@
      <number>5</number>
     </property>
     <item>
-     <widget class="QTabWidget" name="tabWidget">
+     <widget class="QScrollArea" name="mainScrollArea">
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="mainScrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>725</width>
+         <height>762</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_36">
+        <item>
+         <widget class="QTabWidget" name="mainTabWidget">
           <property name="currentIndex">
            <number>0</number>
           </property>
@@ -142,11 +157,11 @@
              </widget>
             </item>
             <item>
-         <widget class="QGroupBox" name="otherPathsSelectionGroupBox">
+             <widget class="QGroupBox" name="groupBox">
               <property name="title">
-           <string>Other Paths Selection</string>
+               <string>Output Selection</string>
               </property>
-          <layout class="QVBoxLayout" name="verticalLayout_9">
+              <layout class="QVBoxLayout" name="verticalLayout_35">
                <item>
                 <layout class="QHBoxLayout" name="outputHorizontalLayout">
                  <item>
@@ -187,6 +202,45 @@
                  </item>
                 </layout>
                </item>
+               <item>
+                <layout class="QHBoxLayout" name="outputFileNameFormatStringHorizontalLayout">
+                 <item>
+                  <widget class="QLabel" name="outputFileNameFormatStringLabel">
+                   <property name="minimumSize">
+                    <size>
+                     <width>63</width>
+                     <height>0</height>
+                    </size>
+                   </property>
+                   <property name="text">
+                    <string>Output File Name Format String</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLineEdit" name="outputFileNameFormatStringLineEdit">
+                   <property name="toolTip">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Format string used to generate output file name(s).&lt;/p&gt;&lt;p&gt;For example, if the input is &amp;quot;sample.mp4&amp;quot;, and the format string is &amp;quot;{original_file_name}_output{extension}&amp;quot;, then the output file name will be &amp;quot;sample_output.mp4&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="text">
+                    <string>{original_file_name}_output{extension}</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="otherPathsSelectionGroupBox">
+              <property name="title">
+               <string>Other Paths Selection</string>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_9">
                <item>
                 <layout class="QHBoxLayout" name="configHorizontalLayout">
                  <item>
@@ -322,6 +376,11 @@
     &lt;/li&gt;
 &lt;/ul&gt;</string>
                      </property>
+                     <item>
+                      <property name="text">
+                       <string>Waifu2X NCNN Vulkan</string>
+                      </property>
+                     </item>
                      <item>
                       <property name="text">
                        <string>Waifu2X Caffe</string>
@@ -332,11 +391,6 @@
                        <string>Waifu2X Converter CPP</string>
                       </property>
                      </item>
-                 <item>
-                  <property name="text">
-                   <string>Waifu2X NCNN Vulkan</string>
-                  </property>
-                 </item>
                      <item>
                       <property name="text">
                        <string>SRMD NCNN Vulkan</string>
@@ -407,6 +461,90 @@
                    </item>
                   </layout>
                  </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="outputWidthHorizontalLayout">
+                   <item>
+                    <widget class="QLabel" name="outputWidthLabel">
+                     <property name="text">
+                      <string>Output Width</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QSpinBox" name="outputWidthSpinBox">
+                     <property name="maximum">
+                      <number>99999</number>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="outputHeightHorizontalLayout">
+                   <item>
+                    <widget class="QLabel" name="outputHeightLabel">
+                     <property name="text">
+                      <string>Output Height</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QSpinBox" name="outputHeightSpinBox">
+                     <property name="maximum">
+                      <number>99999</number>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="imageOutputExtensionHorizontalLayout">
+                   <item>
+                    <widget class="QLabel" name="imageOutputExtensionLabel">
+                     <property name="text">
+                      <string>Image Output Extension</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QLineEdit" name="imageOutputExtensionLineEdit">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="text">
+                      <string>.png</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QHBoxLayout" name="videoOutputExtensionHorizontalLayout">
+                   <item>
+                    <widget class="QLabel" name="videoOutputExtensionLabel">
+                     <property name="text">
+                      <string>Video Output Extension</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QLineEdit" name="videoOutputExtensionLineEdit">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="text">
+                      <string>.mp4</string>
+                     </property>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
                  <item>
                   <widget class="QCheckBox" name="preserveFramesCheckBox">
                    <property name="toolTip">
@@ -433,6 +571,22 @@
                   <layout class="QHBoxLayout" name="framPreviewHorizontalLayout">
                    <item>
                     <layout class="QVBoxLayout" name="framePreviewOptionsVerticalLayout">
+                     <item>
+                      <widget class="QLabel" name="framePreviewLabel">
+                       <property name="frameShape">
+                        <enum>QFrame::StyledPanel</enum>
+                       </property>
+                       <property name="text">
+                        <string/>
+                       </property>
+                       <property name="scaledContents">
+                        <bool>false</bool>
+                       </property>
+                       <property name="alignment">
+                        <set>Qt::AlignCenter</set>
+                       </property>
+                      </widget>
+                     </item>
                      <item>
                       <widget class="QCheckBox" name="framePreviewShowPreviewCheckBox">
                        <property name="text">
@@ -448,36 +602,13 @@
                        <property name="text">
                         <string>Keep Aspect Ratio</string>
                        </property>
+                       <property name="checked">
+                        <bool>true</bool>
+                       </property>
                       </widget>
                      </item>
-                 <item>
-                  <spacer name="framePreviewOptionsVerticalSpacer">
-                   <property name="orientation">
-                    <enum>Qt::Vertical</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>20</width>
-                     <height>40</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
                     </layout>
                    </item>
-               <item>
-                <widget class="QLabel" name="framePreviewLabel">
-                 <property name="frameShape">
-                  <enum>QFrame::StyledPanel</enum>
-                 </property>
-                 <property name="text">
-                  <string/>
-                 </property>
-                 <property name="scaledContents">
-                  <bool>false</bool>
-                 </property>
-                </widget>
-               </item>
                   </layout>
                  </item>
                 </layout>
@@ -516,48 +647,6 @@
                   </item>
                  </layout>
                 </item>
-            <item>
-             <layout class="QHBoxLayout" name="waifu2xCaffeScaleWidthHorizontalLayout">
-              <item>
-               <widget class="QLabel" name="waifu2xCaffeScaleWidthLabel">
-                <property name="text">
-                 <string>Scale Width</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QSpinBox" name="waifu2xCaffeScaleWidthSpinBox">
-                <property name="toolTip">
-                 <string>custom scale width (specifying this will overwrite scale_ratio)</string>
-                </property>
-                <property name="maximum">
-                 <number>999999</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="waifu2xCaffeScaleHeightHorizontalLayout">
-              <item>
-               <widget class="QLabel" name="waifu2xCaffeScaleHeightLabel">
-                <property name="text">
-                 <string>Scale Height</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QSpinBox" name="waifu2xCaffeScaleHeightSpinBox">
-                <property name="toolTip">
-                 <string>custom scale height (specifying this will overwrite scale_ratio)</string>
-                </property>
-                <property name="maximum">
-                 <number>999999</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
                 <item>
                  <layout class="QHBoxLayout" name="waifu2xCaffeModeHorizontalLayout">
                   <item>
@@ -1685,6 +1774,34 @@
                      </property>
                     </widget>
                    </item>
+                   <item>
+                    <widget class="QCheckBox" name="anime4kCppCnnModeCheckBox">
+                     <property name="text">
+                      <string>CNN Mode</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QCheckBox" name="anime4kCppHdnCheckBox">
+                     <property name="text">
+                      <string>HDN</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QCheckBox" name="anime4kCppDisableProgressCheckBox">
+                     <property name="text">
+                      <string>Disable Progress</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QCheckBox" name="anime4kCppAlphaCheckBox">
+                     <property name="text">
+                      <string>Preserve Alpha Channel</string>
+                     </property>
+                    </widget>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -1823,6 +1940,38 @@
                   </property>
                  </spacer>
                 </item>
+                <item row="8" column="0">
+                 <layout class="QHBoxLayout" name="anime4kCppHdnLevelHorizontalLayout">
+                  <item>
+                   <widget class="QLabel" name="anime4kCppHdnLevelLabel">
+                    <property name="text">
+                     <string>HDN Level</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QSpinBox" name="anime4kCppHdnLevelSpinBox">
+                    <property name="value">
+                     <number>1</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </item>
+                <item row="8" column="1">
+                 <layout class="QHBoxLayout" name="anime4kCppForceFpsHorizontalLayout">
+                  <item>
+                   <widget class="QLabel" name="anime4kCppForceFpsLabel">
+                    <property name="text">
+                     <string>Force FPS</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QDoubleSpinBox" name="anime4kCppForceFpsDoubleSpinBox"/>
+                  </item>
+                 </layout>
+                </item>
                </layout>
               </widget>
              </widget>
@@ -2472,42 +2621,6 @@
               </item>
              </layout>
             </item>
-        <item>
-         <layout class="QHBoxLayout" name="gifskiWidthHorizontalLayout">
-          <item>
-           <widget class="QLabel" name="gifskiWidthLabel">
-            <property name="text">
-             <string>Width</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="gifskiWidthSpinBox">
-            <property name="maximum">
-             <number>99999</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="gifskiHeightHorizontalLayout">
-          <item>
-           <widget class="QLabel" name="gifskiHeightLabel">
-            <property name="text">
-             <string>Height</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="gifskiHeightSpinBox">
-            <property name="maximum">
-             <number>99999</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
             <item>
              <widget class="QGroupBox" name="gifskiSwitchesGroupBox">
               <property name="title">
@@ -2583,10 +2696,14 @@
           </widget>
          </widget>
         </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
     <item>
-     <widget class="QGroupBox" name="currentVideoProcessingProgressGroupBox">
+     <widget class="QGroupBox" name="currentProcessingProgressGroupBox">
       <property name="title">
-       <string>Current Video Processing Progress</string>
+       <string>Current Processing Progress</string>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_11">
        <item>
@@ -2678,9 +2795,9 @@
      </widget>
     </item>
     <item>
-     <widget class="QGroupBox" name="overallVideoProcessingProgressGroupBox">
+     <widget class="QGroupBox" name="overallProcessingProgressGroupBox">
       <property name="title">
-       <string>Overall Video Processing Progress</string>
+       <string>Overall Processing Progress</string>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_13">
        <item>
@@ -2770,7 +2887,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>673</width>
+     <width>737</width>
      <height>21</height>
     </rect>
    </property>

src/video2x_setup.py

@@ -48,7 +48,6 @@ SETUP_VERSION = '2.2.1'
 
 # global static variables
 LOCALAPPDATA = pathlib.Path(os.getenv('localappdata'))
-VIDEO2X_CONFIG = pathlib.Path(__file__).parent.absolute() / 'video2x.yaml'
 DRIVER_OPTIONS = ['all',
                   'ffmpeg',
                   'gifski',

src/video2x_setup_ubuntu.sh

@@ -0,0 +1,246 @@
+#!/usr/bin/bash -e
+# Name: Video2X Setup Script (Ubuntu)
+# Creator: K4YT3X
+# Date Created: June 5, 2020
+# Last Modified: September 4, 2020
+
+# help message if input is incorrect of if -h/--help is specified
+if [ "$1" == "-h" ] || [ "$1" == "--help" ] || [ "$#" -gt 2 ]; then
+    echo "usage: $0 INSTALLATION_PATH TEMP"
+    exit 0
+fi
+
+# set intallation path if specified
+if [ ! -z "$1" ]; then
+    export INSTALLATION_PATH=$1
+else
+    export INSTALLATION_PATH="$HOME/.local/share"
+fi
+
+# set temp directory location if specified
+if [ ! -z "$2" ]; then
+    export TEMP=$2
+else
+    export TEMP="/tmp/video2x"
+fi
+
+# environment variables
+export DEBIAN_FRONTEND="noninteractive"
+
+# install basic utilities and add PPAs
+apt-get update
+apt-get install -y --no-install-recommends apt-utils software-properties-common
+
+# add PPAs and sources
+add-apt-repository -y ppa:apt-fast/stable
+add-apt-repository -y ppa:graphics-drivers/ppa
+apt-get install -y --no-install-recommends apt-fast aria2
+apt-fast update
+
+# install runtime packages
+apt-fast install -y --no-install-recommends ffmpeg libmagic1 nvidia-cuda-toolkit nvidia-driver-440 python3.8
+
+# install compilation packages
+apt-fast install -y --no-install-recommends git-core curl wget ca-certificates gnupg2 python3-dev python3-pip python3-setuptools python3-wheel
+
+# add Nvidia sources
+curl -fsSL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub | apt-key add -
+echo "deb https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64 /" >/etc/apt/sources.list.d/nvidia-ml.list
+apt-fast update
+
+# install python3 packages
+git clone --recurse-submodules --progress https://github.com/k4yt3x/video2x.git --depth=1 $INSTALLATION_PATH/video2x
+python3.8 -m pip install -U pip
+python3.8 -m pip install -U -r $INSTALLATION_PATH/video2x/src/requirements.txt
+mkdir -v -p $INSTALLATION_PATH/video2x/src/dependencies
+
+# install gifski
+# cargo from APT might be outdate and will result in gifski components not being built successfully
+# apt-fast install -y --no-install-recommends cargo
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
+source $HOME/.cargo/env
+cargo install gifski
+
+# install waifu2x-caffe
+apt-fast install -y --no-install-recommends autoconf build-essential cmake gcc-8 libatlas-base-dev libboost-atomic-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-iostreams-dev libboost-python-dev libboost-system-dev libboost-thread-dev libcudnn7 libcudnn7-dev libgflags-dev libgoogle-glog-dev libhdf5-dev libleveldb-dev liblmdb-dev libopencv-dev libprotobuf-dev libsnappy-dev protobuf-compiler python-dev python-numpy texinfo yasm zlib1g-dev
+
+git clone --recurse-submodules --depth=1 --progress --recurse-submodules https://github.com/nagadomi/waifu2x-caffe-ubuntu.git $TEMP/waifu2x-caffe-ubuntu
+git clone --recurse-submodules --progress --depth=1 https://github.com/nagadomi/caffe.git $TEMP/waifu2x-caffe-ubuntu/caffe
+
+export CC=/usr/bin/gcc-8
+export CXX=/usr/bin/g++-8
+mkdir -v -p $TEMP/waifu2x-caffe-ubuntu/build
+cd $TEMP/waifu2x-caffe-ubuntu/build
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+make -j$(nproc) install
+
+mv -v /tmp/video2x/waifu2x-caffe-ubuntu/bin $INSTALLATION_PATH/video2x/src/dependencies/waifu2x-caffe
+mv -v /tmp/video2x/waifu2x-caffe-ubuntu/build/waifu2x-caffe $INSTALLATION_PATH/video2x/src/dependencies/waifu2x-caffe/waifu2x-caffe
+
+# install waifu2x-converter-cpp
+apt-fast install -y --no-install-recommends build-essential cmake libopencv-dev beignet-opencl-icd mesa-opencl-icd nvidia-cuda-toolkit ocl-icd-opencl-dev opencl-headers
+git clone --recurse-submodules --depth=1 --progress https://github.com/DeadSix27/waifu2x-converter-cpp $TEMP/waifu2x-converter-cpp
+mkdir -v $TEMP/waifu2x-converter-cpp/build
+cd $TEMP/waifu2x-converter-cpp/build
+cmake ..
+make -j$(nproc)
+ldconfig
+mv -v $TEMP/waifu2x-converter-cpp/build $INSTALLATION_PATH/video2x/src/dependencies/waifu2x-converter-cpp
+mv -v $TEMP/waifu2x-converter-cpp/models_rgb $INSTALLATION_PATH/video2x/src/dependencies/waifu2x-converter-cpp/models_rgb
+
+# install waifu2x-ncnn-vulkan
+# download libvulkan1
+apt-fast install -y --no-install-recommends libvulkan1 unzip jq
+
+# get latest release JSON as a string
+echo "Fetching latest waifu2x-ncnn-vulkan release information using GitHub API"
+waifu2x_ncnn_vulkan_latest_release=$(curl -s https://api.github.com/repos/nihui/waifu2x-ncnn-vulkan/releases/latest)
+
+# count the number of assets in this release
+assets=$(echo "$waifu2x_ncnn_vulkan_latest_release" | jq -r '.assets | length')
+
+# iterate through each of the assets and see if the name of the asset matches what we're looking for
+for i in $(seq $assets $END); do
+    if echo "$waifu2x_ncnn_vulkan_latest_release" | jq -r ".assets["$(($i - 1))"].name" | egrep "^waifu2x-ncnn-vulkan-[0-9]*-linux\.zip$"; then
+        download_link=$(echo "$waifu2x_ncnn_vulkan_latest_release" | jq -r ".assets["$(($i - 1))"].browser_download_url")
+        break
+    fi
+done
+
+# check if download_link variable is set
+if [ -z "$download_link" ]; then
+    echo "$waifu2x_ncnn_vulkan_latest_release"
+    echo "Error: unable to find waifu2x-ncnn-vulkan download link or GitHub API rate limit exceeded"
+    exit 1
+fi
+
+waifu2x_ncnn_vulkan_zip="$TEMP/waifu2x-ncnn-vulkan-linux.zip"
+echo "Downloading $download_link to $waifu2x_ncnn_vulkan_zip"
+aria2c "$download_link" --dir / -o "$waifu2x_ncnn_vulkan_zip"
+unzip "$waifu2x_ncnn_vulkan_zip" -d $TEMP/waifu2x-ncnn-vulkan
+mv -v $TEMP/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-*-linux $INSTALLATION_PATH/video2x/src/dependencies/waifu2x-ncnn-vulkan
+
+# install srmd-ncnn-vulkan
+# download libvulkan1
+apt-fast install -y --no-install-recommends libvulkan1 unzip jq
+
+# get latest release JSON as a string
+echo "Fetching latest srmd-ncnn-vulkan release information using GitHub API"
+srmd_ncnn_vulkan_latest_release=$(curl -s https://api.github.com/repos/nihui/srmd-ncnn-vulkan/releases/latest)
+
+# count the number of assets in this release
+assets=$(echo "$srmd_ncnn_vulkan_latest_release" | jq -r '.assets | length')
+
+# iterate through each of the assets and see if the name of the asset matches what we're looking for
+for i in $(seq $assets $END); do
+    if echo "$srmd_ncnn_vulkan_latest_release" | jq -r ".assets["$(($i - 1))"].name" | egrep "^srmd-ncnn-vulkan-[0-9]*-linux\.zip$"; then
+        download_link=$(echo "$srmd_ncnn_vulkan_latest_release" | jq -r ".assets["$(($i - 1))"].browser_download_url")
+        break
+    fi
+done
+
+# check if download_link variable is set
+if [ -z "$download_link" ]; then
+    echo "$srmd_ncnn_vulkan_latest_release"
+    echo "Error: unable to find srmd-ncnn-vulkan download link or GitHub API rate limit exceeded"
+    exit 1
+fi
+
+srmd_ncnn_vulkan_zip="$TEMP/srmd-ncnn-vulkan-linux.zip"
+echo "Downloading $download_link to $srmd_ncnn_vulkan_zip"
+aria2c "$download_link" --dir / -o "$srmd_ncnn_vulkan_zip"
+unzip "$srmd_ncnn_vulkan_zip" -d $TEMP/srmd-ncnn-vulkan
+mv -v $TEMP/srmd-ncnn-vulkan/srmd-ncnn-vulkan-*-linux $INSTALLATION_PATH/video2x/src/dependencies/srmd-ncnn-vulkan
+
+# install realsr-ncnn-vulkan
+# download libvulkan1
+apt-fast install -y --no-install-recommends libvulkan1 unzip jq
+
+# get latest release JSON as a string
+echo "Fetching latest realsr-ncnn-vulkan release information using GitHub API"
+realsr_ncnn_vulkan_latest_release=$(curl -s https://api.github.com/repos/nihui/realsr-ncnn-vulkan/releases/latest)
+
+# count the number of assets in this release
+assets=$(echo "$realsr_ncnn_vulkan_latest_release" | jq -r '.assets | length')
+
+# iterate through each of the assets and see if the name of the asset matches what we're looking for
+for i in $(seq $assets $END); do
+    if echo "$realsr_ncnn_vulkan_latest_release" | jq -r ".assets["$(($i - 1))"].name" | egrep "^realsr-ncnn-vulkan-[0-9]*-linux\.zip$"; then
+        download_link=$(echo "$realsr_ncnn_vulkan_latest_release" | jq -r ".assets["$(($i - 1))"].browser_download_url")
+        break
+    fi
+done
+
+# check if download_link variable is set
+if [ -z "$download_link" ]; then
+    echo "$realsr_ncnn_vulkan_latest_release"
+    echo "Error: unable to find realsr-ncnn-vulkan download link or GitHub API rate limit exceeded"
+    exit 1
+fi
+
+realsr_ncnn_vulkan_zip="$TEMP/realsr-ncnn-vulkan-linux.zip"
+echo "Downloading $download_link to $realsr_ncnn_vulkan_zip"
+aria2c "$download_link" --dir / -o "$realsr_ncnn_vulkan_zip"
+unzip "$realsr_ncnn_vulkan_zip" -d $TEMP/realsr-ncnn-vulkan
+mv -v $TEMP/realsr-ncnn-vulkan/realsr-ncnn-vulkan-*-linux $INSTALLATION_PATH/video2x/src/dependencies/realsr-ncnn-vulkan
+
+# install Anime4KCPP
+# install the latest cmake for compiling Anime4KCPP
+aria2c https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-Linux-x86_64.sh --dir / -o "$TEMP/cmake.sh"
+mkdir /cmake
+bash "$TEMP/cmake.sh" --prefix=/cmake --skip-license
+
+# build and install Anime4KCPP
+apt-fast install -y --no-install-recommends libopencv-dev opencl-dev
+git clone --recurse-submodules --depth=1 --progress https://github.com/TianZerL/Anime4KCPP.git $TEMP/anime4kcpp
+mkdir -v $TEMP/anime4kcpp/build
+cd $TEMP/anime4kcpp/build
+/cmake/bin/cmake -DBuild_GUI=OFF ..
+make -j$(nproc)
+mv -v $TEMP/anime4kcpp/build $INSTALLATION_PATH/video2x/src/dependencies/anime4kcpp
+ln -s $INSTALLATION_PATH/video2x/src/dependencies/anime4kcpp/bin/libAnime4KCPPCore.so /usr/lib
+
+# rewrite config file values
+python3.8 - <<EOF
+import yaml
+import os
+
+
+INSTALLATION_PATH = os.environ['INSTALLATION_PATH']
+
+with open('{}/video2x/src/video2x.yaml'.format(INSTALLATION_PATH), 'r') as template:
+    template_dict = yaml.load(template, Loader=yaml.FullLoader)
+    template.close()
+
+template_dict['ffmpeg']['ffmpeg_path'] = '/usr/bin'
+template_dict['gifski']['gifski_path'] = '/root/.cargo/bin/gifski'
+template_dict['waifu2x_caffe']['path'] = '{}/video2x/src/dependencies/waifu2x-caffe/waifu2x-caffe'.format(INSTALLATION_PATH)
+template_dict['waifu2x_converter_cpp']['path'] = '{}/video2x/src/dependencies/waifu2x-converter-cpp/waifu2x-converter-cpp'.format(INSTALLATION_PATH)
+template_dict['waifu2x_ncnn_vulkan']['path'] = '{}/video2x/src/dependencies/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan'.format(INSTALLATION_PATH)
+template_dict['srmd_ncnn_vulkan']['path'] = '{}/video2x/src/dependencies/srmd-ncnn-vulkan/srmd-ncnn-vulkan'.format(INSTALLATION_PATH)
+template_dict['realsr_ncnn_vulkan']['path'] = '{}/video2x/src/dependencies/realsr-ncnn-vulkan/realsr-ncnn-vulkan'.format(INSTALLATION_PATH)
+template_dict['anime4kcpp']['path'] = '{}/video2x/src/dependencies/anime4kcpp/bin/Anime4KCPP_CLI'.format(INSTALLATION_PATH)
+
+# write configuration into file
+with open('{}/video2x/src/video2x.yaml'.format(INSTALLATION_PATH), 'w') as config:
+    yaml.dump(template_dict, config)
+EOF
+
+# clean up temp directory
+# purge default utilities
+# apt-get purge -y git-core curl wget ca-certificates gnupg2 python3-dev python3-pip python3-setuptools
+
+# purge waifu2x-caffe build dependencies
+# apt-get purge -y autoconf build-essential cmake gcc-8 libatlas-base-dev libboost-atomic-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-iostreams-dev libboost-python-dev libboost-system-dev libboost-thread-dev libcudnn7 libcudnn7-dev libgflags-dev libgoogle-glog-dev libhdf5-dev libleveldb-dev liblmdb-dev libopencv-dev libprotobuf-dev libsnappy-dev protobuf-compiler python-numpy texinfo yasm zlib1g-dev
+
+# purge waifu2x-converter-cpp build dependencies
+# apt-get purge -y libopencv-dev ocl-icd-opencl-dev
+
+# purge waifu2x/srmd/realsr-ncnn-vulkan build dependencies
+# apt-get purge -y unzip jq
+
+# run autoremove and purge all unused packages
+# apt-get autoremove --purge -y
+
+# remove temp directory
+rm -rf $TEMP

src/wrappers/anime4kcpp.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
-Name: Waifu2x Caffe Driver
+Name: Anime4KCPP Driver
 Author: K4YT3X
 Date Created: May 3, 2020
-Last Modified: May 11, 2020
+Last Modified: September 9, 2020
 
 Description: This class is a high-level wrapper
-for waifu2x-caffe.
+for Anime4KCPP.
 """
 
 # built-in imports
@@ -15,7 +15,6 @@ import argparse
 import os
 import pathlib
 import platform
-import shlex
 import subprocess
 import threading
 
@@ -59,20 +58,30 @@ class WrapperMain:
         parser.add_argument('-r', '--preFilters', type=int, help='Enhancement filter, only working when preProcessing is true,there are 5 options by binary:Median blur=0000001, Mean blur=0000010, CAS Sharpening=0000100, Gaussian blur weak=0001000, Gaussian blur=0010000, Bilateral filter=0100000, Bilateral filter faster=1000000, you can freely combine them, eg: Gaussian blur weak + Bilateral filter = 0001000 | 0100000 = 0101000 = 40(D)')
         parser.add_argument('-e', '--postFilters', type=int, help='Enhancement filter, only working when postProcessing is true,there are 5 options by binary:Median blur=0000001, Mean blur=0000010, CAS Sharpening=0000100, Gaussian blur weak=0001000, Gaussian blur=0010000, Bilateral filter=0100000, Bilateral filter faster=1000000, you can freely combine them, eg: Gaussian blur weak + Bilateral filter = 0001000 | 0100000 = 0101000 = 40(D), so you can put 40 to enable Gaussian blur weak and Bilateral filter, which also is what I recommend for image that < 1080P, 48 for image that >= 1080P, and for performance I recommend to use 72 for video that < 1080P, 80 for video that >=1080P')
         parser.add_argument('-q', '--GPUMode', action='store_true', help='Enable GPU acceleration')
+        parser.add_argument('-w', '--CNNMode', action='store_true', help='Enable ACNet')
+        parser.add_argument('-H', '--HDN', action='store_true', help='Enable HDN mode for ACNet')
+        parser.add_argument('-L', '--HDNLevel', type=int, help='Set HDN level')
         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])')
+        parser.add_argument('-F', '--forceFps', type=float, help='Set output video fps to the specifying number, 0 to disable')
+        parser.add_argument('-D', '--disableProgress', action='store_true', help='disable progress display')
+        parser.add_argument('-W', '--webVideo', type=str, help='process the video from URL')
+        parser.add_argument('-A', '--alpha', action='store_true', help='preserve the Alpha channel for transparent image')
         return parser.parse_args(arguments)
 
     def load_configurations(self, upscaler):
-        self.driver_settings['zoomFactor'] = upscaler.scale_ratio
+        # self.driver_settings['zoomFactor'] = upscaler.scale_ratio
         self.driver_settings['threads'] = upscaler.processes
 
         # append FFmpeg path to the end of PATH
         # Anime4KCPP will then use FFmpeg to migrate audio tracks
         os.environ['PATH'] += f';{upscaler.ffmpeg_settings["ffmpeg_path"]}'
 
+    def set_scale_ratio(self, scale_ratio: float):
+        self.driver_settings['zoomFactor'] = scale_ratio
+
     def upscale(self, input_file, output_file):
         """This is the core function for WAIFU2X class
 
@@ -83,6 +92,10 @@ class WrapperMain:
             height {int} -- output video height
         """
 
+        # change the working directory to the binary's parent directory
+        # so the binary can find shared object files and other files
+        os.chdir(pathlib.Path(self.driver_settings['path']).parent)
+
         # overwrite config file settings
         self.driver_settings['input'] = input_file
         self.driver_settings['output'] = output_file
@@ -115,6 +128,6 @@ class WrapperMain:
 
         # return the Popen object of the new process created
         self.print_lock.acquire()
-        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {" ".join(execute)}')
         self.print_lock.release()
         return subprocess.Popen(execute)

src/wrappers/ffmpeg.py

@@ -4,7 +4,7 @@
 Name: Video2X FFmpeg Controller
 Author: K4YT3X
 Date Created: Feb 24, 2018
-Last Modified: May 14, 2020
+Last Modified: September 13, 2020
 
 Description: This class handles all FFmpeg related operations.
 """
@@ -12,7 +12,6 @@ Description: This class handles all FFmpeg related operations.
 # built-in imports
 import json
 import pathlib
-import shlex
 import subprocess
 
 # third-party imports
@@ -27,7 +26,7 @@ class Ffmpeg:
     and inserting audio tracks to videos.
     """
 
-    def __init__(self, ffmpeg_settings, image_format='png'):
+    def __init__(self, ffmpeg_settings, extracted_frame_format='png'):
         self.ffmpeg_settings = ffmpeg_settings
 
         self.ffmpeg_path = pathlib.Path(self.ffmpeg_settings['ffmpeg_path'])
@@ -35,7 +34,7 @@ class Ffmpeg:
         self.ffmpeg_probe_binary = self.ffmpeg_path / 'ffprobe'
 
         # video metadata
-        self.image_format = image_format
+        self.extracted_frame_format = extracted_frame_format
         self.intermediate_file_name = pathlib.Path(self.ffmpeg_settings['intermediate_file_name'])
         self.pixel_format = self.ffmpeg_settings['extract_frames']['output_options']['-pix_fmt']
 
@@ -58,7 +57,7 @@ class Ffmpeg:
         # turn elements into str
         execute = [str(e) for e in execute]
 
-        Avalon.debug_info(f'Executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'Executing: {" ".join(execute)}')
 
         # initialize dictionary to store pixel formats
         pixel_formats = {}
@@ -66,7 +65,7 @@ class Ffmpeg:
         # record all pixel formats into dictionary
         for line in subprocess.run(execute, check=True, stdout=subprocess.PIPE).stdout.decode().split('\n'):
             try:
-                pixel_formats[' '.join(line.split()).split()[1]] = int(' '.join(line.split()).split()[3])
+                pixel_formats[" ".join(line.split()).split()[1]] = int(" ".join(line.split()).split()[3])
             except (IndexError, ValueError):
                 pass
 
@@ -75,6 +74,37 @@ class Ffmpeg:
 
         return pixel_formats
 
+    def get_number_of_frames(self, input_file: str, video_stream_index: int) -> int:
+        """ Count the number of frames in a video
+
+        Args:
+            input_file (str): input file path
+            video_stream_index (int): index number of the video stream
+
+        Returns:
+            int: number of frames in the video
+        """
+
+        execute = [
+            self.ffmpeg_probe_binary,
+            '-v',
+            'quiet',
+            '-count_frames',
+            '-select_streams',
+            f'v:{video_stream_index}',
+            '-show_entries',
+            'stream=nb_read_frames',
+            '-of',
+            'default=nokey=1:noprint_wrappers=1',
+            input_file
+        ]
+
+        # turn elements into str
+        execute = [str(e) for e in execute]
+
+        Avalon.debug_info(f'Executing: {" ".join(execute)}')
+        return int(subprocess.run(execute, check=True, stdout=subprocess.PIPE).stdout.decode().strip())
+
     def probe_file_info(self, input_video):
         """ Gets input video information
 
@@ -105,7 +135,7 @@ class Ffmpeg:
         # turn elements into str
         execute = [str(e) for e in execute]
 
-        Avalon.debug_info(f'Executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'Executing: {" ".join(execute)}')
         json_str = subprocess.run(execute, check=True, stdout=subprocess.PIPE).stdout
         return json.loads(json_str.decode('utf-8'))
 
@@ -133,7 +163,8 @@ class Ffmpeg:
 
         # specify output file
         execute.extend([
-            extracted_frames / f'extracted_%0d.{self.image_format}'
+            extracted_frames / f'extracted_%0d.{self.extracted_frame_format}'
+            # extracted_frames / f'frame_%06d.{self.extracted_frame_format}'
         ])
 
         return(self._execute(execute))
@@ -174,7 +205,8 @@ class Ffmpeg:
         # append input frames path into command
         execute.extend([
             '-i',
-            upscaled_frames / f'extracted_%d.{self.image_format}'
+            upscaled_frames / f'extracted_%d.{self.extracted_frame_format}'
+            # upscaled_frames / f'%06d.{self.extracted_frame_format}'
         ])
 
         # read FFmpeg output options
@@ -283,5 +315,5 @@ class Ffmpeg:
     def _execute(self, execute):
         # turn all list elements into string to avoid errors
         execute = [str(e) for e in execute]
-        Avalon.debug_info(f'Executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'Executing: {" ".join(execute)}')
         return subprocess.Popen(execute)

src/wrappers/gifski.py

@@ -4,7 +4,7 @@
 Name: Gifski Wrapper
 Creator: K4YT3X
 Date Created: May 11, 2020
-Last Modified: May 11, 2020
+Last Modified: September 13, 2020
 
 Description: High-level wrapper for Gifski.
 """
@@ -22,20 +22,24 @@ class Gifski:
     def __init__(self, gifski_settings):
         self.gifski_settings = gifski_settings
 
-    def make_gif(self, upscaled_frames: pathlib.Path, output_path: pathlib.Path, framerate: float, image_format: str) -> subprocess.Popen:
+    def make_gif(self, upscaled_frames: pathlib.Path, output_path: pathlib.Path, framerate: float, extracted_frame_format: str, output_width: int, output_height: int) -> subprocess.Popen:
         execute = [
             self.gifski_settings['gifski_path'],
             '-o',
             output_path,
             '--fps',
-            int(round(framerate, 0))
+            int(round(framerate, 0)),
+            '--width',
+            output_width,
+            '--height',
+            output_height
         ]
 
         # load configurations from config file
         execute.extend(self._load_configuration())
 
         # append frames location
-        execute.extend([upscaled_frames / f'extracted_*.{image_format}'])
+        execute.extend([upscaled_frames / f'extracted_*.{extracted_frame_format}'])
 
         return(self._execute(execute))
 

src/wrappers/realsr_ncnn_vulkan.py

@@ -4,7 +4,7 @@
 Name: RealSR NCNN Vulkan Driver
 Creator: K4YT3X
 Date Created: May 26, 2020
-Last Modified: May 26, 2020
+Last Modified: September 9, 2020
 
 Description: This class is a high-level wrapper
 for realsr_ncnn_vulkan.
@@ -15,7 +15,6 @@ import argparse
 import os
 import pathlib
 import platform
-import shlex
 import subprocess
 import threading
 
@@ -44,7 +43,7 @@ class WrapperMain:
         parser.add_argument('-v', action='store_true', help='verbose output')
         parser.add_argument('-i', type=str, help=argparse.SUPPRESS)  # help='input image path (jpg/png) or directory')
         parser.add_argument('-o', type=str, help=argparse.SUPPRESS)  # help='output image path (png) or directory')
-        parser.add_argument('-s', type=int, choices=[4], help='upscale ratio')
+        parser.add_argument('-s', type=int, help='upscale ratio')
         parser.add_argument('-t', type=int, help='tile size (>=32/0=auto)')
         parser.add_argument('-m', type=str, help='realsr model path')
         parser.add_argument('-g', type=int, help='gpu device to use')
@@ -53,9 +52,12 @@ class WrapperMain:
         return parser.parse_args(arguments)
 
     def load_configurations(self, upscaler):
-        self.driver_settings['s'] = int(upscaler.scale_ratio)
+        # self.driver_settings['s'] = int(upscaler.scale_ratio)
         self.driver_settings['j'] = '{}:{}:{}'.format(upscaler.processes, upscaler.processes, upscaler.processes)
 
+    def set_scale_ratio(self, scale_ratio: int):
+        self.driver_settings['s'] = int(scale_ratio)
+
     def upscale(self, input_directory, output_directory):
         """This is the core function for RealSR NCNN Vulkan class
 
@@ -65,6 +67,10 @@ class WrapperMain:
             ratio {int} -- output video ratio
         """
 
+        # change the working directory to the binary's parent directory
+        # so the binary can find shared object files and other files
+        os.chdir(pathlib.Path(self.driver_settings['path']).parent)
+
         # overwrite config file settings
         self.driver_settings['i'] = input_directory
         self.driver_settings['o'] = output_directory
@@ -97,6 +103,6 @@ class WrapperMain:
 
         # return the Popen object of the new process created
         self.print_lock.acquire()
-        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {" ".join(execute)}')
         self.print_lock.release()
         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 11, 2020
+Last Modified: September 9, 2020
 
 Description: This class is a high-level wrapper
 for srmd_ncnn_vulkan.
@@ -15,7 +15,6 @@ import argparse
 import os
 import pathlib
 import platform
-import shlex
 import subprocess
 import threading
 
@@ -45,7 +44,7 @@ class WrapperMain:
         parser.add_argument('-i', type=str, help=argparse.SUPPRESS)  # help='input image path (jpg/png) or directory')
         parser.add_argument('-o', type=str, help=argparse.SUPPRESS)  # help='output image path (png) or directory')
         parser.add_argument('-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('-s', type=int, help='upscale ratio')
         parser.add_argument('-t', type=int, help='tile size (>=32)')
         parser.add_argument('-m', type=str, help='srmd model path')
         parser.add_argument('-g', type=int, help='gpu device to use')
@@ -54,9 +53,12 @@ class WrapperMain:
         return parser.parse_args(arguments)
 
     def load_configurations(self, upscaler):
-        self.driver_settings['s'] = int(upscaler.scale_ratio)
+        # self.driver_settings['s'] = int(upscaler.scale_ratio)
         self.driver_settings['j'] = '{}:{}:{}'.format(upscaler.processes, upscaler.processes, upscaler.processes)
 
+    def set_scale_ratio(self, scale_ratio: int):
+        self.driver_settings['s'] = int(scale_ratio)
+
     def upscale(self, input_directory, output_directory):
         """This is the core function for SRMD ncnn Vulkan class
 
@@ -66,6 +68,10 @@ class WrapperMain:
             ratio {int} -- output video ratio
         """
 
+        # change the working directory to the binary's parent directory
+        # so the binary can find shared object files and other files
+        os.chdir(pathlib.Path(self.driver_settings['path']).parent)
+
         # overwrite config file settings
         self.driver_settings['i'] = input_directory
         self.driver_settings['o'] = output_directory
@@ -98,6 +104,6 @@ class WrapperMain:
 
         # return the Popen object of the new process created
         self.print_lock.acquire()
-        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {" ".join(execute)}')
         self.print_lock.release()
         return subprocess.Popen(execute)

src/wrappers/waifu2x_caffe.py

@@ -4,7 +4,7 @@
 Name: Waifu2x Caffe Driver
 Author: K4YT3X
 Date Created: Feb 24, 2018
-Last Modified: May 11, 2020
+Last Modified: September 12, 2020
 
 Description: This class is a high-level wrapper
 for waifu2x-caffe.
@@ -13,7 +13,7 @@ for waifu2x-caffe.
 # built-in imports
 import argparse
 import os
-import shlex
+import pathlib
 import subprocess
 import threading
 
@@ -62,17 +62,31 @@ class WrapperMain:
 
     def load_configurations(self, upscaler):
         # use scale width and scale height if specified
-        self.driver_settings['scale_ratio'] = upscaler.scale_ratio
+        # self.driver_settings['scale_ratio'] = upscaler.scale_ratio
-        self.driver_settings['output_extention'] = upscaler.image_format
+        self.driver_settings['output_extention'] = upscaler.extracted_frame_format
 
         # bit_depth will be 12 at this point
         # it will up updated later
         self.driver_settings['output_depth'] = 12
 
+    def set_scale_resolution(self, width: int, height: int):
+        self.driver_settings['scale_width'] = width
+        self.driver_settings['scale_height'] = height
+        self.driver_settings['scale_ratio'] = None
+
+    def set_scale_ratio(self, scale_ratio: float):
+        self.driver_settings['scale_width'] = None
+        self.driver_settings['scale_height'] = None
+        self.driver_settings['scale_ratio'] = scale_ratio
+
     def upscale(self, input_directory, output_directory):
         """ start upscaling process
         """
 
+        # change the working directory to the binary's parent directory
+        # so the binary can find shared object files and other files
+        os.chdir(pathlib.Path(self.driver_settings['path']).parent)
+
         # overwrite config file settings
         self.driver_settings['input_path'] = input_directory
         self.driver_settings['output_path'] = output_directory
@@ -100,6 +114,6 @@ class WrapperMain:
 
         # return the Popen object of the new process created
         self.print_lock.acquire()
-        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {" ".join(execute)}')
         self.print_lock.release()
         return subprocess.Popen(execute)

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 11, 2020
+Last Modified: September 9, 2020
 
 Description: This class is a high-level wrapper
 for waifu2x-converter-cpp.
@@ -14,7 +14,6 @@ for waifu2x-converter-cpp.
 import argparse
 import os
 import pathlib
-import shlex
 import subprocess
 import threading
 
@@ -67,9 +66,12 @@ class WrapperMain:
         return parser.parse_args(arguments)
 
     def load_configurations(self, upscaler):
-        self.driver_settings['scale-ratio'] = upscaler.scale_ratio
+        # self.driver_settings['scale-ratio'] = upscaler.scale_ratio
         self.driver_settings['jobs'] = upscaler.processes
-        self.driver_settings['output-format'] = upscaler.image_format.lower()
+        self.driver_settings['output-format'] = upscaler.extracted_frame_format.lower()
+
+    def set_scale_ratio(self, scale_ratio: float):
+        self.driver_settings['scale-ratio'] = scale_ratio
 
     def upscale(self, input_directory, output_directory):
         """ Waifu2x Converter Driver Upscaler
@@ -82,6 +84,10 @@ class WrapperMain:
             threads {int} -- number of threads
         """
 
+        # change the working directory to the binary's parent directory
+        # so the binary can find shared object files and other files
+        os.chdir(pathlib.Path(self.driver_settings['path']).parent)
+
         # overwrite config file settings
         self.driver_settings['input'] = input_directory
         self.driver_settings['output'] = output_directory
@@ -114,6 +120,6 @@ class WrapperMain:
 
         # return the Popen object of the new process created
         self.print_lock.acquire()
-        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {" ".join(execute)}')
         self.print_lock.release()
         return subprocess.Popen(execute)

src/wrappers/waifu2x_ncnn_vulkan.py

@@ -7,7 +7,7 @@ Date Created: June 26, 2019
 Last Modified: May 11, 2020
 
 Editor: K4YT3X
-Last Modified: February 22, 2020
+Last Modified: September 9, 2020
 
 Description: This class is a high-level wrapper
 for waifu2x_ncnn_vulkan.
@@ -18,7 +18,6 @@ import argparse
 import os
 import pathlib
 import platform
-import shlex
 import subprocess
 import threading
 
@@ -48,7 +47,7 @@ class WrapperMain:
         parser.add_argument('-i', type=str, help=argparse.SUPPRESS)  # help='input image path (jpg/png) or directory')
         parser.add_argument('-o', type=str, help=argparse.SUPPRESS)  # help='output image path (png) or directory')
         parser.add_argument('-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('-s', type=int, help='upscale ratio')
         parser.add_argument('-t', type=int, help='tile size (>=32)')
         parser.add_argument('-m', type=str, help='waifu2x model path')
         parser.add_argument('-g', type=int, help='gpu device to use')
@@ -57,11 +56,14 @@ class WrapperMain:
         return parser.parse_args(arguments)
 
     def load_configurations(self, upscaler):
-        self.driver_settings['s'] = int(upscaler.scale_ratio)
+        # self.driver_settings['s'] = int(upscaler.scale_ratio)
         self.driver_settings['j'] = '{}:{}:{}'.format(upscaler.processes, upscaler.processes, upscaler.processes)
 
+    def set_scale_ratio(self, scale_ratio: int):
+        self.driver_settings['s'] = int(scale_ratio)
+
     def upscale(self, input_directory, output_directory):
-        """This is the core function for WAIFU2X class
+        """ This is the core function for waifu2x class
 
         Arguments:
             input_directory {string} -- source directory path
@@ -69,6 +71,10 @@ class WrapperMain:
             ratio {int} -- output video ratio
         """
 
+        # change the working directory to the binary's parent directory
+        # so the binary can find shared object files and other files
+        os.chdir(pathlib.Path(self.driver_settings['path']).parent)
+
         # overwrite config file settings
         self.driver_settings['i'] = input_directory
         self.driver_settings['o'] = output_directory
@@ -101,6 +107,6 @@ class WrapperMain:
 
         # return the Popen object of the new process created
         self.print_lock.acquire()
-        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {shlex.join(execute)}')
+        Avalon.debug_info(f'[upscaler] Subprocess {os.getpid()} executing: {" ".join(execute)}')
         self.print_lock.release()
         return subprocess.Popen(execute)