V 2.2.11 优化MJ代理模式

resources/scripts/Lai.py

@@ -17,8 +17,8 @@ if len(sys.argv) < 2:
         "C:\\Users\\27698\\Desktop\\LAITool\\resources\\scripts\\Lai.exe",
         "-ka",
         "C:\\Users\\27698\\Desktop\\测试\\123\\测试用 不删.mp4",
-       "C:\\Users\\27698\\Desktop\\测试\\123\\测试用 不删.json",
-        30
+        "C:\\Users\\27698\\Desktop\\测试\\123\\测试用 不删.json",
+        30,
     ]
 
 print(sys.argv)
@@ -35,9 +35,7 @@ elif __file__:
 
 def set_ffmpeg_env():
     # 根据你的ffmpeg路径替换这个
-    ffmpeg_path = os.path.join(
-        cript_directory, "../package/ffmpeg-2023-12-07-git-f89cff96d0-full_build/bin"
-    )
+    ffmpeg_path = os.path.join(cript_directory, "../package/ffmpeg/win")
 
     if sys.platform == "win32":
         ffmpeg_path = ffmpeg_path.replace("/", "\\")

resources/scripts/clip.py

@@ -33,10 +33,10 @@ class Clip:
         self.config_path = config_path
         self.gpu_type = gpu_type
         self.ffmpeg_path = (
-            "../package/ffmpeg-2023-12-07-git-f89cff96d0-full_build/bin/ffmpeg"
+            "../package/ffmpeg/win/ffmpeg"
         )
         self.ffprobe_path = (
-            "../package/ffmpeg-2023-12-07-git-f89cff96d0-full_build/bin/ffprobe"
+            "../package/ffmpeg/win/ffprobe"
         )
         self.getInitData()
         pass

resources/scripts/getgrame.py

@@ -130,7 +130,7 @@ def init(draft_path, out_dir, package_path):
                 file.write(line + "\n")
 
     ffmpeg_path = os.path.join(
-        package_path, "ffmpeg-2023-12-07-git-f89cff96d0-full_build/bin/ffmpeg"
+        package_path, "ffmpeg/win/ffmpeg"
     )
     # 抽取关键帧
     num = 1

resources/scripts/iamge_to_video.py

@@ -13,12 +13,8 @@ class ImageToVideo:
         self.frames = 0
         self.gpu_type = gpu_type
         self.public_tools = public_tools.PublicTools()
-        self.ffmpeg_path = (
-            "../package/ffmpeg-2023-12-07-git-f89cff96d0-full_build/bin/ffmpeg"
-        )
-        self.ffprobe_path = (
-            "../package/ffmpeg-2023-12-07-git-f89cff96d0-full_build/bin/ffprobe"
-        )
+        self.ffmpeg_path = "../package/ffmpeg/win/ffmpeg"
+        self.ffprobe_path = "../package/ffmpeg/win/ffprobe"
         pass
 
     def create_video_from_image_with_center_offset(