OpenSourceJoker/video2x
3
0
Fork 0
mirror of https://github.com/k4yt3x/video2x.git synced 2025-01-30 23:58:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

renamed FFmpeg phase names to match FFmpeg wrapper function names

Browse Source
This commit is contained in:
k4yt3x 2020-05-12 21:11:30 -04:00
parent 9b4ee89aee
commit 1b6c4b8c49
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/video2x.yaml
View File

@ -1,7 +1,7 @@
# Name: Video2X Configuration File # Name: Video2X Configuration File
# Creator: K4YT3X # Creator: K4YT3X
# Date Created: October 23, 2018 # 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 # Values here are the default values. Change the value here to
# save the default value permanently. # save the default value permanently.
# Items commented out are parameters irrelevant to this context # Items commented out are parameters irrelevant to this context
@ -101,17 +101,17 @@ anime4kcpp:
ffmpeg: ffmpeg:
ffmpeg_path: '%LOCALAPPDATA%\video2x\ffmpeg-latest-win64-static\bin' ffmpeg_path: '%LOCALAPPDATA%\video2x\ffmpeg-latest-win64-static\bin'
intermediate_file_name: 'intermediate.mkv' intermediate_file_name: 'intermediate.mkv'
# step 1: extract all frames from original input # Step 1: Frame Extraction
# into temporary directory # extract all frames from original input into temporary directory
input_to_frames: extract_frames:
output_options: output_options:
'-qscale:v': null '-qscale:v': null
'-pix_fmt': rgba64be '-pix_fmt': rgba64be
'-hwaccel': auto '-hwaccel': auto
'-y': true '-y': true
# step 2: stitch all frames back into a video # Step 2: Video Assembly
# with only a video track # assemble all frames back into a video with only a video track
frames_to_video: assemble_video:
input_options: input_options:
'-qscale:v': null '-qscale:v': null
'-qscale:a': null '-qscale:a': null
@ -123,9 +123,10 @@ ffmpeg:
'-pix_fmt': null '-pix_fmt': null
'-hwaccel': auto '-hwaccel': auto
'-y': true '-y': true
# step 3: migrate audio and subtitle tracks from original # Step 3: Streams Migration
# migrate audio and subtitle streams from original
# video into the upscaled video # video into the upscaled video
migrating_tracks: migrate_streams:
output_options: output_options:
'-map': '-map':
- '0:v?' - '0:v?'

14
src/wrappers/ffmpeg.py
View File

@ -116,14 +116,14 @@ class Ffmpeg:
self.ffmpeg_binary self.ffmpeg_binary
] ]
execute.extend(self._read_configuration(phase='input_to_frames')) execute.extend(self._read_configuration(phase='extract_frames'))
execute.extend([ execute.extend([
'-i', '-i',
input_file 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([ execute.extend([
extracted_frames / f'extracted_%0d.{self.image_format}' extracted_frames / f'extracted_%0d.{self.image_format}'
@ -150,10 +150,10 @@ class Ffmpeg:
] ]
# read other options # read other options
execute.extend(self._read_configuration(phase='frames_to_video')) execute.extend(self._read_configuration(phase='assemble_video'))
# read FFmpeg input options # 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 # WORKAROUND FOR WAIFU2X-NCNN-VULKAN
# Dev: SAT3LL # Dev: SAT3LL
@ -171,7 +171,7 @@ class Ffmpeg:
]) ])
# read FFmpeg output options # 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 # specify output file location
execute.extend([ execute.extend([
@ -192,7 +192,7 @@ class Ffmpeg:
self.ffmpeg_binary self.ffmpeg_binary
] ]
execute.extend(self._read_configuration(phase='migrating_tracks')) execute.extend(self._read_configuration(phase='migrate_streams'))
execute.extend([ execute.extend([
'-i', '-i',
@ -201,7 +201,7 @@ class Ffmpeg:
input_video 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([ execute.extend([
output_video output_video