q792602257/FrameTour-RenderWorker
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lut

Browse Source
This commit is contained in:
Jerry Yan
2025-08-01 16:11:20 +08:00
parent 1119a7b030
commit bf912037d1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
biz/ffmpeg.py
View File

@@ -61,8 +61,8 @@ def parse_ffmpeg_task(task_info, template_info):
sub_ffmpeg_task.zoom_cut = part.get("zoom_cut", None) sub_ffmpeg_task.zoom_cut = part.get("zoom_cut", None)
for effect in part.get('effects', []): for effect in part.get('effects', []):
sub_ffmpeg_task.add_effect(effect) sub_ffmpeg_task.add_effect(effect)
for lut in part.get('filters', []): for lut in part.get('luts', []):
sub_ffmpeg_task.add_lut(os.path.join(template_info.get("local_path"), lut)) sub_ffmpeg_task.add_lut(os.path.join(template_info.get("local_path"), lut).replace("\\", "/"))
for audio in part.get('audios', []): for audio in part.get('audios', []):
sub_ffmpeg_task.add_audios(os.path.join(template_info.get("local_path"), audio)) sub_ffmpeg_task.add_audios(os.path.join(template_info.get("local_path"), audio))
for overlay in part.get('overlays', []): for overlay in part.get('overlays', []):
@@ -81,8 +81,8 @@ def parse_ffmpeg_task(task_info, template_info):
# task.ext_data = ext_data or {} # task.ext_data = ext_data or {}
for effect in overall.get('effects', []): for effect in overall.get('effects', []):
task.add_effect(effect) task.add_effect(effect)
for lut in overall.get('filters', []): for lut in overall.get('luts', []):
task.add_lut(os.path.join(template_info.get("local_path"), lut)) task.add_lut(os.path.join(template_info.get("local_path"), lut).replace("\\", "/"))
for audio in overall.get('audios', []): for audio in overall.get('audios', []):
task.add_audios(os.path.join(template_info.get("local_path"), audio)) task.add_audios(os.path.join(template_info.get("local_path"), audio))
for overlay in overall.get('overlays', []): for overlay in overall.get('overlays', []):

4
entity/ffmpeg.py
View File

@@ -260,11 +260,11 @@ class FfmpegTask(object):
elif effect.startswith("zoom:"): 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: if self.resolution:
filter_args.append(f"{video_output_str}scale={self.resolution.replace('x', ':')}[v]") filter_args.append(f"{video_output_str}scale={self.resolution.replace('x', ':')}[v]")
video_output_str = "[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: for overlay in self.overlays:
input_index = input_args.count("-i") input_index = input_args.count("-i")
input_args.append("-i") input_args.append("-i")