From bf912037d1eb44cd39d84c3b97caa4b1aaf9664f Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 1 Aug 2025 16:11:20 +0800 Subject: [PATCH] lut --- biz/ffmpeg.py | 8 ++++---- entity/ffmpeg.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/biz/ffmpeg.py b/biz/ffmpeg.py index 74fd90b..be23fab 100644 --- a/biz/ffmpeg.py +++ b/biz/ffmpeg.py @@ -61,8 +61,8 @@ def parse_ffmpeg_task(task_info, template_info): sub_ffmpeg_task.zoom_cut = part.get("zoom_cut", None) for effect in part.get('effects', []): sub_ffmpeg_task.add_effect(effect) - for lut in part.get('filters', []): - sub_ffmpeg_task.add_lut(os.path.join(template_info.get("local_path"), lut)) + for lut in part.get('luts', []): + sub_ffmpeg_task.add_lut(os.path.join(template_info.get("local_path"), lut).replace("\\", "/")) for audio in part.get('audios', []): sub_ffmpeg_task.add_audios(os.path.join(template_info.get("local_path"), audio)) for overlay in part.get('overlays', []): @@ -81,8 +81,8 @@ def parse_ffmpeg_task(task_info, template_info): # task.ext_data = ext_data or {} for effect in overall.get('effects', []): task.add_effect(effect) - for lut in overall.get('filters', []): - task.add_lut(os.path.join(template_info.get("local_path"), lut)) + for lut in overall.get('luts', []): + task.add_lut(os.path.join(template_info.get("local_path"), lut).replace("\\", "/")) for audio in overall.get('audios', []): task.add_audios(os.path.join(template_info.get("local_path"), audio)) for overlay in overall.get('overlays', []): diff --git a/entity/ffmpeg.py b/entity/ffmpeg.py index 54b4646..e706f01 100644 --- a/entity/ffmpeg.py +++ b/entity/ffmpeg.py @@ -260,11 +260,11 @@ class FfmpegTask(object): elif effect.startswith("zoom:"): ... ... - for lut in self.luts: - filter_args.append(f"{video_output_str}lut3d=file={lut}{video_output_str}") if self.resolution: filter_args.append(f"{video_output_str}scale={self.resolution.replace('x', ':')}[v]") video_output_str = "[v]" + for lut in self.luts: + filter_args.append(f"{video_output_str}lut3d=file={lut}{video_output_str}") for overlay in self.overlays: input_index = input_args.count("-i") input_args.append("-i")