diff --git a/src/video2x.yaml b/src/video2x.yaml index 023309e..87786ef 100644 --- a/src/video2x.yaml +++ b/src/video2x.yaml @@ -1,7 +1,7 @@ # Name: Video2X Configuration File # Creator: K4YT3X # Date Created: October 23, 2018 -# Last Modified: May 11, 2020 +# Last Modified: May 12, 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 @@ -101,17 +101,17 @@ anime4kcpp: ffmpeg: ffmpeg_path: '%LOCALAPPDATA%\video2x\ffmpeg-latest-win64-static\bin' intermediate_file_name: 'intermediate.mkv' - # step 1: extract all frames from original input - # into temporary directory - input_to_frames: + # Step 1: Frame Extraction + # extract all frames from original input into temporary directory + extract_frames: output_options: '-qscale:v': null '-pix_fmt': rgba64be '-hwaccel': auto '-y': true - # step 2: stitch all frames back into a video - # with only a video track - frames_to_video: + # Step 2: Video Assembly + # assemble all frames back into a video with only a video track + assemble_video: input_options: '-qscale:v': null '-qscale:a': null @@ -123,9 +123,10 @@ ffmpeg: '-pix_fmt': null '-hwaccel': auto '-y': true - # step 3: migrate audio and subtitle tracks from original - # video into the upscaled video - migrating_tracks: + # Step 3: Streams Migration + # migrate audio and subtitle streams from original + # video into the upscaled video + migrate_streams: output_options: '-map': - '0:v?' diff --git a/src/wrappers/ffmpeg.py b/src/wrappers/ffmpeg.py index 627e4f2..8c940a4 100644 --- a/src/wrappers/ffmpeg.py +++ b/src/wrappers/ffmpeg.py @@ -116,14 +116,14 @@ class Ffmpeg: self.ffmpeg_binary ] - execute.extend(self._read_configuration(phase='input_to_frames')) + execute.extend(self._read_configuration(phase='extract_frames')) execute.extend([ '-i', input_file ]) - execute.extend(self._read_configuration(phase='input_to_frames', section='output_options')) + execute.extend(self._read_configuration(phase='extract_frames', section='output_options')) execute.extend([ extracted_frames / f'extracted_%0d.{self.image_format}' @@ -150,10 +150,10 @@ class Ffmpeg: ] # read other options - execute.extend(self._read_configuration(phase='frames_to_video')) + execute.extend(self._read_configuration(phase='assemble_video')) # read FFmpeg input options - execute.extend(self._read_configuration(phase='frames_to_video', section='input_options')) + execute.extend(self._read_configuration(phase='assemble_video', section='input_options')) # WORKAROUND FOR WAIFU2X-NCNN-VULKAN # Dev: SAT3LL @@ -171,7 +171,7 @@ class Ffmpeg: ]) # read FFmpeg output options - execute.extend(self._read_configuration(phase='frames_to_video', section='output_options')) + execute.extend(self._read_configuration(phase='assemble_video', section='output_options')) # specify output file location execute.extend([ @@ -192,7 +192,7 @@ class Ffmpeg: self.ffmpeg_binary ] - execute.extend(self._read_configuration(phase='migrating_tracks')) + execute.extend(self._read_configuration(phase='migrate_streams')) execute.extend([ '-i', @@ -201,7 +201,7 @@ class Ffmpeg: input_video ]) - execute.extend(self._read_configuration(phase='migrating_tracks', section='output_options')) + execute.extend(self._read_configuration(phase='migrate_streams', section='output_options')) execute.extend([ output_video