FFMpeg-Compressor: Switch to other ffmpeg lib, add CRF parameter for video

This commit is contained in:
OleSTEEP 2024-04-26 01:33:51 +03:00
parent a973fe79e8
commit 0ad60b5b94
5 changed files with 19 additions and 15 deletions

View file

@ -27,6 +27,7 @@ Python utility uses ffmpeg to compress Visual Novel Resources
* Quality - Quality level of images. Values range: `0-100` (100 - best quality, 0 - worst quality) * Quality - Quality level of images. Values range: `0-100` (100 - best quality, 0 - worst quality)
#### VIDEO section #### VIDEO section
* CRF ("Constant Quality") - Video quality parameter for ffmpeg. The CRF value can be from 0 to 63. Lower values mean better quality. Recommended values range from 15 to 35, with 31 being recommended for 1080p HD video. (default: `27`)
* SkipVideo - Skip processing all video files. (default: `false`) * SkipVideo - Skip processing all video files. (default: `false`)
* Extension - Required image file extension. It supports: `.3gp`, `.amv`, `.avi`, `.gif`, `.m2l`, `.m4v`, `.mkv`, `.mov`, `.mp4`, `.m4v`, `.mpeg`, `.mpv`, `.webm`, `.ogv` * Extension - Required image file extension. It supports: `.3gp`, `.amv`, `.avi`, `.gif`, `.m2l`, `.m4v`, `.mkv`, `.mov`, `.mp4`, `.m4v`, `.mpeg`, `.mpv`, `.webm`, `.ogv`
* Codec - (Maybe optional in future) Required video codec. (See official ffmpeg documentation for supported codecs) * Codec - (Maybe optional in future) Required video codec. (See official ffmpeg documentation for supported codecs)

View file

@ -17,6 +17,7 @@ Lossless = true
Quality = 100 Quality = 100
[VIDEO] [VIDEO]
SkipVideo = true CRF = 27
SkipVideo = false
Extension = "webm" Extension = "webm"
Codec = "libvpx-vp9" Codec = "libvpx-vp9"

View file

@ -3,7 +3,7 @@ from modules import printer
from modules import utils from modules import utils
from PIL import Image from PIL import Image
import pillow_avif import pillow_avif
import ffmpeg from ffmpeg import FFmpeg, FFmpegError
import os import os
@ -28,13 +28,13 @@ def compress_audio(folder, file, target_folder, extension):
printer.files(file, os.path.splitext(file)[0], extension, f"{bitrate}") printer.files(file, os.path.splitext(file)[0], extension, f"{bitrate}")
try: try:
(ffmpeg (FFmpeg()
.input(f'{folder}/{file}') .input(f'{folder}/{file}')
.output(utils.check_duplicates(f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'), .output(utils.check_duplicates(f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'),
audio_bitrate=bitrate) {"b:a": bitrate})
.run(quiet=True) .execute()
) )
except ffmpeg._run.Error as e: except FFmpegError as e:
utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}') utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}')
utils.errors_count += 1 utils.errors_count += 1
if not configloader.config['FFMPEG']['HideErrors']: if not configloader.config['FFMPEG']['HideErrors']:
@ -45,15 +45,17 @@ def compress_audio(folder, file, target_folder, extension):
def compress_video(folder, file, target_folder, extension): def compress_video(folder, file, target_folder, extension):
if not configloader.config['VIDEO']['SkipVideo']: if not configloader.config['VIDEO']['SkipVideo']:
codec = configloader.config['VIDEO']['Codec'] codec = configloader.config['VIDEO']['Codec']
crf = configloader.config['VIDEO']['CRF']
printer.files(file, os.path.splitext(file)[0], extension, codec) printer.files(file, os.path.splitext(file)[0], extension, codec)
try: try:
(ffmpeg (FFmpeg()
.input(f'{folder}/{file}') .input(f'{folder}/{file}')
.output(utils.check_duplicates(f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'), vcodec=codec) .output(utils.check_duplicates(f'{target_folder}/{os.path.splitext(file)[0]}.{extension}'),
.run(quiet=True) {"codec:v": codec, "v:b": 0}, crf=crf)
.execute()
) )
except ffmpeg._run.Error as e: except FFmpegError as e:
utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}') utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}')
utils.errors_count += 1 utils.errors_count += 1
if not configloader.config['FFMPEG']['HideErrors']: if not configloader.config['FFMPEG']['HideErrors']:
@ -97,12 +99,12 @@ def compress(folder, file, target_folder):
if configloader.config["FFMPEG"]["ForceCompress"]: if configloader.config["FFMPEG"]["ForceCompress"]:
printer.unknown_file(file) printer.unknown_file(file)
try: try:
(ffmpeg (FFmpeg()
.input(f'{folder}/{file}') .input(f'{folder}/{file}')
.output(f'{target_folder}/{file}') .output(f'{target_folder}/{file}')
.run(quiet=True) .execute()
) )
except ffmpeg._run.Error as e: except FFmpegError as e:
utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}') utils.add_unprocessed_file(f'{folder}/{file}', f'{target_folder}/{file}')
utils.errors_count += 1 utils.errors_count += 1
if not configloader.config['FFMPEG']['HideErrors']: if not configloader.config['FFMPEG']['HideErrors']:

View file

@ -38,7 +38,7 @@ def files(source, dest, dest_ext, comment):
def unknown_file(file): def unknown_file(file):
print(clean_str(f"\r* \033[0;33m{file}\033[0m (File will be force compressed wia ffmpeg)")) print(clean_str(f"\r* \033[0;33m{file}\033[0m (File will be force compressed via ffmpeg)"))
bar.next() bar.next()

View file

@ -1,5 +1,5 @@
Pillow==9.5.0 Pillow==9.5.0
pillow-avif-plugin==1.4.1 pillow-avif-plugin==1.4.1
ffmpeg-python==0.2.0 python-ffmpeg==2.0.12
progress==1.6 progress==1.6
colorama==0.4.6 colorama==0.4.6