diff --git a/FFMpeg-Compressor/README.md b/FFMpeg-Compressor/README.md index 612fd46..2a9d7fb 100644 --- a/FFMpeg-Compressor/README.md +++ b/FFMpeg-Compressor/README.md @@ -20,7 +20,6 @@ Python utility uses ffmpeg to compress Visual Novel Resources #### IMAGE section * 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) -* JpegComp - (May be deleted in future) Compression level specific for jpeg images. Values range: `0-10` (10 - max compression, 0 - min compression) #### VIDEO section * Extension - Required image file extension. It supports: `.3gp`, `.amv`, `.avi`, `.gif`, `.m4v`, `.mkv`, `.mov`, `.mp4`, `.m4v`, `.mpeg`, `.mpv`, `.webm`, `.ogv` diff --git a/FFMpeg-Compressor/ffmpeg-comp.toml b/FFMpeg-Compressor/ffmpeg-comp.toml index 820219b..1a1794b 100644 --- a/FFMpeg-Compressor/ffmpeg-comp.toml +++ b/FFMpeg-Compressor/ffmpeg-comp.toml @@ -12,7 +12,6 @@ BitRate = "320k" [IMAGE] Extension = "jpg" CompLevel = 20 -JpegComp = 3 [VIDEO] Extension = "mp4" diff --git a/FFMpeg-Compressor/modules/compressor.py b/FFMpeg-Compressor/modules/compressor.py index 3ae9ca9..4cd5545 100644 --- a/FFMpeg-Compressor/modules/compressor.py +++ b/FFMpeg-Compressor/modules/compressor.py @@ -70,13 +70,12 @@ def compress_video(folder, file, target_folder): def compress_image(folder, file, target_folder): ffmpeg_params = configloader.config['FFMPEG']['FFmpegParams'] 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 not has_transparency(Image.open(f'{folder}/{file}')): - printer.files(file, os.path.splitext(file)[0], get_req_ext(file), f"level {jpg_comp}") - os.system(f"ffmpeg -i '{folder}/{file}' {ffmpeg_params} -q {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 {comp_level/10} " f"'{target_folder}/{os.path.splitext(file)[0]}.{get_req_ext(file)}'") else: printer.warning(f"{file} has transparency (.jpg not support it). Skipping...")