Merge pull request #6 from FarisR99/release-1.2.0

Author: FarisR99

.gitignore

@@ -1,3 +1,4 @@
+.idea/
 venv/
 venv
 shaders

Anime4K.py

@@ -8,12 +8,14 @@
 from extract_subs import extract_subs
 from multi import multi
 from mux import mux
+from patch import patch
 from shader import shader
 from splitter import split_by_seconds, get_video_length
 from utils import __current_version__, is_tool, credz, str2dict
 
 # Constant variables
-MODES_SUPPORTING_MULTI_INPUTS = ["shader", "multi", "encode"]
+MODES_SUPPORTING_MULTI_INPUTS = ["shader", "multi", "encode", "patch"]
+MODES_TO_IGNORE_OUTPUT_EXISTENCE = ["patch"]
 
 # Print credits
 credz()
@@ -37,6 +39,9 @@
 parser.add_argument("-v", "--version", required=False,
                     action='store_true',
                     help="Print the current version of Anime4K-Encoder")
+parser.add_argument("--debug", "--verbose", required=False,
+                    action='store_true',
+                    help='Enable debug mode; print more information and no screen clearing')
 parser.add_argument("-m", "--mode", required=False,
                     default="shader",
                     help='''Modes:
@@ -46,7 +51,10 @@
  mux - Mux/compile a media file with audio files and subtitle files
  multi - Apply shader with -ss and -sa, audio, subs and mux mode in order
  encode - Encode media files using X265 with predefined settings
- split - Split a media file into parts''')
+ split - Split a media file into parts
+ patch - Extract audio and subs from input files then mux with already upscaled 
+         output files located in the output directory with matching file names.
+         This is essentially a mux mode supporting multiple files.''')
 parser.add_argument("-ew", "--width", required=False, type=int, default=3840,
                     help="Desired width when applying shader")
 parser.add_argument("-eh", "--height", required=False, type=int, default=2160,
@@ -71,6 +79,8 @@
                     action='store_true',
                     default=False,
                     help="Set this flag if you want to manually mux audio when using mode shader")
+parser.add_argument("-fps", "--fps", required=False, type=float,
+                    help="Desired framerate when applying shader")
 parser.add_argument("-sm", "--skip_menus", required=False, type=str2dict,
                     help='''Skip choice menus
 Examples for mode shader:
@@ -90,13 +100,17 @@
                     default=False,
                     help="Set this flag to delete output files that have failed to compile when using mode multi")
 parser.add_argument("-si", "--skip_input", required=False, action='append',
-                    help="Input file to skip when using a directory as an input for modes shader and multi")
+                    help="Input file to skip when using a directory as an input for modes shader, multi and patch")
 
 args = vars(parser.parse_args())
 if args['version']:
     print("Anime4K-Encoder v" + __current_version__)
     sys.exit(1)
 
+debug = args['debug']
+if debug is None:
+    debug = False
+
 
 def exit_if_missing(file_path: str, allow_dir: bool = True):
     if not os.path.isdir(file_path):
@@ -151,7 +165,9 @@ def exit_if_missing(file_path: str, allow_dir: bool = True):
                 output = output + "/"
 elif mode in MODES_SUPPORTING_MULTI_INPUTS:
     output = args['output'] or "out.mkv"
-    if os.path.isdir(output) and not os.path.exists(output):
+    if mode not in MODES_TO_IGNORE_OUTPUT_EXISTENCE \
+            and os.path.isdir(output) \
+            and not os.path.exists(output):
         try:
             os.mkdir(output)
         except Exception as e:
@@ -179,14 +195,14 @@ def exit_if_missing(file_path: str, allow_dir: bool = True):
                 os.path.join(file, "*.mp4")
             ):
                 file_name = os.path.basename(file_in_dir)
-                if file_name in skip_inputs:
+                if file_in_dir in skip_inputs or file_name in skip_inputs:
                     continue
                 in_files.append(os.path.join(file_in_dir))
         else:
             # Only here for consistency
             # Why would you specify a file input then add that file
             # to a list of files to ignore?
-            if file in skip_inputs:
+            if file in skip_inputs or os.path.basename(file) in skip_inputs:
                 continue
             in_files.append(os.path.join(file))
     file_count = len(in_files)
@@ -206,24 +222,28 @@ def exit_if_missing(file_path: str, allow_dir: bool = True):
 
 # Perform action based on mode
 if mode == "audio":
-    extract_audio(fn, output, skip_menus)
+    extract_audio(debug, fn, output, skip_menus)
 elif mode == "subs":
-    extract_subs(fn, output)
+    extract_subs(debug, fn, output)
 elif mode == "mux":
-    mux(fn, output)
+    mux(debug, fn, output)
 elif mode == "shader":
-    shader(in_files, args['width'], args['height'],
+    shader(debug, in_files, args['width'], args['height'],
            args['shader_dir'], args['bit'], args['audio_language'],
-           args['softsubs'], args['softaudio'], skip_menus, True, output)
+           args['softsubs'], args['softaudio'], args['fps'], skip_menus, True,
+           output)
 elif mode == "multi":
-    multi(in_files, args['width'], args['height'],
-          args['shader_dir'], args['bit'], skip_menus,
+    multi(debug, in_files, args['width'], args['height'],
+          args['shader_dir'], args['bit'], args['fps'], skip_menus,
           args['delete_failures'], output)
 elif mode == "encode":
-    encode_to_hevc(in_files, output, skip_menus)
+    encode_to_hevc(debug, in_files, output, skip_menus)
 elif mode == "split":
     length = get_video_length(fn)
-    split_by_seconds(filename=fn, split_length=args['split_length'],
+    split_by_seconds(debug=debug, filename=fn,
+                     split_length=args['split_length'],
                      video_length=length, split_dir=output)
+elif mode == "patch":
+    patch(debug, in_files, skip_menus, output)
 else:
     print("Unknown mode: {0}".format(mode))

README.md

@@ -24,8 +24,7 @@ changes. The key differences between Anime4K-Encode-4.0.1 and this repository
 are:
 
 - Cleaned up code
-- Re-added NVENC support and added AMD GPU encoding support (completely
-  untested)
+- Re-added NVENC support and added CPU AV1, AMD GPU and Intel QuickSync support
 - Re-added 10-bit toggling support
 - Removed official support for videos with a resolution lower than FHD
 - Added support for MP4 files
@@ -128,27 +127,23 @@ default is used. On my system and I'd assume most systems, this is 6.2.
 Requirements:
 
 - Latest NVIDIA driver
-- Type `ffmpeg -help` and ensure ffmpeg has been built with `--enable-nvenc`.
-  If not, manually compile ffmpeg
+- Type `ffmpeg` and ensure ffmpeg has been built with `--enable-nvenc`. If not, manually compile ffmpeg
   with [these]((https://docs.nvidia.com/video-technologies/video-codec-sdk/ffmpeg-with-nvidia-gpu/#compiling-for-linux))
   instructions
 - May
   need [cuda](https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#verify-you-have-cuda-enabled-system)
   installed
 
-I had some issues getting NVENC working initially so if this doesn't work for
-you, you may need to tinker with a bunch of different packages.
-
 #### AMD GPUs
 
-I've added support for AMD's "Advanced Media Framework", but I've heard the
-quality is quite bad using this. I do not know how this encoder works nor have
-I tested it, so the code implementation is based on online (lack of)
-documentation. Feel free to raise an Issue ticket on GitHub if there are
-errors, I do own an AMD RX 6900XT so I can attempt to reproduce it.
+I've added support for AMD GPUs using VAAPI. This requires AMD drivers. I do not know how this encoder works nor have I
+tested it, so the code implementation is based on online (lack of) documentation. Feel free to raise an Issue ticket on
+GitHub if there are errors, however I cannot fix it myself.
+
+#### Intel QuickSync
 
-[Here's](https://gist.github.com/Brainiarc7/95c9338a737aa36d9bb2931bed379219) a
-Gist I found related to setting ffmpeg up to support it.
+Intel QuickSync is supported, but requires the desired FPS to be set. It's also very slow and is best for 1080p or
+lower.
 
 ## **[Optional]** Encoding ffmpeg progressbar
 

ccolors.py

@@ -0,0 +1,16 @@
+# Taken from https://svn.blender.org/svnroot/bf-blender/trunk/blender/build_files/scons/tools/bcolors.py
+class ccolors:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+
+    def disable(self):
+        self.HEADER = ''
+        self.OKBLUE = ''
+        self.OKGREEN = ''
+        self.WARNING = ''
+        self.FAIL = ''
+        self.ENDC = ''

encode.py

@@ -7,7 +7,7 @@
 from utils import current_date, is_tool, clear
 
 
-def encode_to_hevc(input_files: "list[str]", out: str,
+def encode_to_hevc(debug: bool, input_files: "list[str]", out: str,
                    skip_menus: dict) -> dict:
     """
     Encode a media file to HEVC using X265
@@ -28,13 +28,18 @@ def encode_to_hevc(input_files: "list[str]", out: str,
         if detail_choice < 0 or detail_choice > 4:
             detail_choice = None
     if detail_choice is None:
-        detail_menu = TerminalMenu([
-            "One setting to rule them all (Recommended if you don't know)",
-            "Flat, slow anime (slice of life, everything is well lit, e.g. Your Name)",
-            "Some dark scenes, some battle scenes (shonen, historical, etc., e.g. Kimetsu no Yaiba)",
-            "[TV Series] Movie-tier dark scene, complex grain/detail (Rarely used)",
-            "[Movie] Movie-tier dark scene, complex grain/detail (Rarely used)",
-        ], title="Choose the encode options")
+        detail_menu = TerminalMenu(
+            [
+                "One setting to rule them all (Recommended if you don't know)",
+                "Flat, slow anime (slice of life, everything is well lit, e.g. Your Name)",
+                "Some dark scenes, some battle scenes (shonen, historical, etc., e.g. Kimetsu no Yaiba)",
+                "[TV Series] Movie-tier dark scene, complex grain/detail (Rarely used)",
+                "[Movie] Movie-tier dark scene, complex grain/detail (Rarely used)",
+            ],
+            title="Choose the encode options",
+            clear_screen=(debug is False),
+            clear_menu_on_exit=(debug is False)
+        )
         detail_choice = detail_menu.show()
         if detail_choice is None:
             print("Cancelled")

extract_audio.py

@@ -7,10 +7,40 @@
 from pymkv import MKVFile
 from simple_term_menu import TerminalMenu
 
-from utils import current_date, language_mapping
+from utils import current_date, language_mapping, lang_short_to_long
 
 
-def extract_audio(fn: str, out_dir: str, skip_menus: dict) -> bool:
+def show_convert_audio_menu(debug: bool, skip_menus: dict) -> int:
+    convert_choice = None
+    if "convert" in skip_menus:
+        convert_choice = int(skip_menus['convert'])
+        if convert_choice < 0 or convert_choice > 1:
+            convert_choice = None
+        else:
+            # Flip the value, because "1" in the command line arg means
+            # "Yes" which is at index 0 in convert_menu choice array
+            convert_choice = 1 - convert_choice
+    if convert_choice is None \
+            and "recommended" in skip_menus \
+            and skip_menus["recommended"] == "1":
+        convert_choice = 1
+    if convert_choice is None:
+        convert_menu = TerminalMenu(
+            ["Yes", "No"],
+            title="Do you want to convert every FLAC to Opus?",
+            clear_screen=(debug is False),
+            clear_menu_on_exit=(debug is False)
+        )
+        convert_choice = convert_menu.show()
+        if convert_choice is None:
+            print("Cancelled conversion")
+            convert_choice = 1
+    skip_menus['convert'] = str(1 - convert_choice)
+    return convert_choice
+
+
+def extract_audio(debug: bool, fn: str, out_dir: str,
+                  skip_menus: dict) -> bool:
     """
     Extract audio from a media file.
 
@@ -35,7 +65,11 @@ def extract_audio(fn: str, out_dir: str, skip_menus: dict) -> bool:
     for track in tracks:
         if track.track_type == 'audio':
             ext = track._track_codec
-            lang = language_mapping[track._language]
+            if track._language not in language_mapping:
+                print("WARNING: Unknown track language: {0}".format(track._language))
+                lang = "Japanese"
+            else:
+                lang = lang_short_to_long(track._language)
             id = str(track._track_id)
             return_code = -1
             try:
@@ -51,6 +85,8 @@ def extract_audio(fn: str, out_dir: str, skip_menus: dict) -> bool:
                     sys.exit(-1)
                 except SystemExit:
                     os._exit(-1)
+            if debug:
+                print("mkvextract exited with return code={}", return_code)
             if return_code != 0:
                 success = False
 
@@ -60,24 +96,7 @@ def extract_audio(fn: str, out_dir: str, skip_menus: dict) -> bool:
     for file in glob.glob(out_dir + "*.FLAC"):
         flacs.append(file)
     if len(flacs) > 0:
-        convert_choice = None
-        if "convert" in skip_menus:
-            convert_choice = int(skip_menus['convert'])
-            if convert_choice < 0 or convert_choice > 1:
-                convert_choice = None
-            else:
-                # Flip the value, because "1" in the command line arg means
-                # "Yes" which is at index 0 in convert_menu choice array
-                convert_choice = 1 - convert_choice
-        if convert_choice is None:
-            convert_menu = TerminalMenu(
-                ["Yes", "No"],
-                title="Do you want to convert every FLAC to Opus?"
-            )
-            convert_choice = convert_menu.show()
-            if convert_choice is None:
-                print("Cancelled conversion")
-
+        convert_choice = show_convert_audio_menu(debug, skip_menus)
         if convert_choice == 0:
             print("Conversion start time: " + current_date())
             for f in flacs:
@@ -90,7 +109,10 @@ def extract_audio(fn: str, out_dir: str, skip_menus: dict) -> bool:
                 if br_choice is None:
                     br_menu = TerminalMenu(
                         bit_rates,
-                        title="What's the format of the file? => {0}".format(f)
+                        title="What's the format of the file? => {0}".format(
+                            f),
+                        clear_screen=(debug is False),
+                        clear_menu_on_exit=(debug is False),
                     )
                     br_choice = br_menu.show()
                     if br_choice is None:

extract_subs.py

@@ -5,7 +5,6 @@
 
 from utils import current_date
 
-
 def genExt(codec):
     if "PGS" in codec:
         return "sup"
@@ -19,7 +18,7 @@ def genExt(codec):
         return None
 
 
-def extract_subs(fn: str, out_dir: str) -> bool:
+def extract_subs(debug: bool, fn: str, out_dir: str) -> bool:
     """
     Extract subtitles from a media file.
 
@@ -61,6 +60,8 @@ def extract_subs(fn: str, out_dir: str) -> bool:
                 print("Cancelled subtitles extraction.")
                 print("Exiting program...")
                 sys.exit(-1)
+            if debug:
+                print("mkvextract exited with return code={}", return_code)
             if return_code != 0:
                 success = False
     print("Subtitle extraction end time: " + current_date())