From 91a612eb53b69a7d4ee510a5ad980d3dbf0cffb8 Mon Sep 17 00:00:00 2001
From: Lei Liu <lei.liu@zstack.io>
Date: Fri, 13 Sep 2024 22:23:09 +0800
Subject: [PATCH] Update requirements.txt and fix issue when rendering video
 with subtitles

In moviepy version 1.0.3, CompositeVideoClip is a module within
moviepy.video.compositing. To use it correctly, we need to import the
CompositeVideoClip class from the module.

This commit makes the following changes:
- Update the import statement for CompositeVideoClip in videoclipper.py
  to import the class from the module.
- Fix the moviepy version to 1.0.3 in requirements.txt to avoid unexpected
  behavior due to version upgrades.

These changes resolve the issue encountered when rendering videos with
subtitles using moviepy 1.0.3.
---
 funclip/videoclipper.py | 4 ++--
 requirements.txt        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/funclip/videoclipper.py b/funclip/videoclipper.py
index 14097e5..b4aa513 100644
--- a/funclip/videoclipper.py
+++ b/funclip/videoclipper.py
@@ -16,7 +16,7 @@
 import moviepy.editor as mpy
 from moviepy.video.tools.subtitles import SubtitlesClip, TextClip
 from moviepy.editor import VideoFileClip, concatenate_videoclips
-from moviepy.video.compositing import CompositeVideoClip
+from moviepy.video.compositing.CompositeVideoClip import CompositeVideoClip
 from utils.subtitle_utils import generate_srt, generate_srt_clip
 from utils.argparse_tools import ArgumentParser, get_commandline_args
 from utils.trans_utils import pre_proc, proc, write_state, load_state, proc_spk, convert_pcm_to_float
@@ -441,4 +441,4 @@ def main(cmd=None):
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/requirements.txt b/requirements.txt
index 4817934..3a38499 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ librosa
 soundfile
 scikit-learn>=1.3.2
 funasr>=1.1.2
-moviepy
+moviepy==1.0.3
 numpy==1.26.4
 gradio
 modelscope