VienDesuPorting/VNTools
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

FFMpeg-Compressor: Delete JpegCompression parameter in config

Browse source
This commit is contained in:
OleSTEEP 2023-10-09 23:47:16 +03:00
parent 7d087fc5b6
commit ea893fd8d1
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
FFMpeg-Compressor/README.md
View file

@ -20,7 +20,6 @@ Python utility uses ffmpeg to compress Visual Novel Resources
#### IMAGE section #### IMAGE section
* Extension - Required image file extension. It supports: `.apng`, `.avif`, `.bmp`, `.jfif`, `.pjpeg`, `.pjp`, `.svg`, `.webp`, `.jpg/.jpeg`, `.png`, `.raw` * Extension - Required image file extension. It supports: `.apng`, `.avif`, `.bmp`, `.jfif`, `.pjpeg`, `.pjp`, `.svg`, `.webp`, `.jpg/.jpeg`, `.png`, `.raw`
* CompLevel - Compression level for images. Values range: `0-100` (100 - max compression, 0 - min compression) * CompLevel - Compression level for images. Values range: `0-100` (100 - max compression, 0 - min compression)
* JpegComp - (May be deleted in future) Compression level specific for jpeg images. Values range: `0-10` (10 - max compression, 0 - min compression)
#### VIDEO section #### VIDEO section
* Extension - Required image file extension. It supports: `.3gp`, `.amv`, `.avi`, `.gif`, `.m4v`, `.mkv`, `.mov`, `.mp4`, `.m4v`, `.mpeg`, `.mpv`, `.webm`, `.ogv` * Extension - Required image file extension. It supports: `.3gp`, `.amv`, `.avi`, `.gif`, `.m4v`, `.mkv`, `.mov`, `.mp4`, `.m4v`, `.mpeg`, `.mpv`, `.webm`, `.ogv`

1
FFMpeg-Compressor/ffmpeg-comp.toml
View file

@ -12,7 +12,6 @@ BitRate = "320k"
[IMAGE] [IMAGE]
Extension = "jpg" Extension = "jpg"
CompLevel = 20 CompLevel = 20
JpegComp = 3
[VIDEO] [VIDEO]
Extension = "mp4" Extension = "mp4"

5
FFMpeg-Compressor/modules/compressor.py
View file

@ -70,13 +70,12 @@ def compress_video(folder, file, target_folder):
def compress_image(folder, file, target_folder): def compress_image(folder, file, target_folder):
ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams'] ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams']
comp_level = configloader.config['IMAGE']['CompLevel'] comp_level = configloader.config['IMAGE']['CompLevel']
jpg_comp = configloader.config['IMAGE']['JpegComp']
if get_req_ext(file) == "jpg" or get_req_ext(file) == "jpeg": if get_req_ext(file) == "jpg" or get_req_ext(file) == "jpeg":
if not has_transparency(Image.open(f'{folder}/{file}')): if not has_transparency(Image.open(f'{folder}/{file}')):
printer.files(file, os.path.splitext(file)[0], get_req_ext(file), f"level {jpg_comp}") printer.files(file, os.path.splitext(file)[0], get_req_ext(file), f"{comp_level}%")
os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -q {jpg_comp} " os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -q {comp_level/10} "
f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'") f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'")
else: else:
printer.warning(f"{file} has transparency (.jpg not support it). Skipping...") printer.warning(f"{file} has transparency (.jpg not support it). Skipping...")