feat(constant): 更新软件版本号至 0.0.6- 在 constant/__init__.py 文件中将 SOFTWARE_VERSION 从 '0.0.5' 修改为 '0.0.6'

- 在 entity/ffmpeg.py 文件中添加了新的视频效果处理逻辑，支持显示特定时长的视频片段

.gitignore

@@ -31,4 +31,5 @@ target/
 .venv
 venv/
 cython_debug/
-.env
+.env
+.serena

constant/__init__.py

@@ -6,4 +6,4 @@ SUPPORT_FEATURE = (
     'rclone_upload',
     'custom_re_encode',
 )
-SOFTWARE_VERSION = '0.0.5'
+SOFTWARE_VERSION = '0.0.6'

entity/ffmpeg.py

@@ -271,7 +271,7 @@ class FfmpegTask(object):
                     if param == '':
                         param = "1"
                     if param != "1":
-                        # 视频变速
+                        # 视频变速：使用fps实现，避免PTS冲突
                         effect_index += 1
                         filter_args.append(f"{video_output_str}setpts={param}*PTS[v_eff{effect_index}]")
                         video_output_str = f"[v_eff{effect_index}]"
@@ -280,29 +280,24 @@ class FfmpegTask(object):
                     if param == '':
                         continue
                     _split = param.split(",")
-                    if len(_split) < 3:
+                    if len(_split) < 2:
                         continue
                     try:
                         start_time = float(_split[0])
                         zoom_factor = float(_split[1])
-                        duration = float(_split[2])
                         if start_time < 0:
                             start_time = 0
-                        if duration < 0:
-                            duration = 0
                         if zoom_factor <= 0:
                             zoom_factor = 1
                     except (ValueError, IndexError):
                         start_time = 0
-                        duration = 0
                         zoom_factor = 1
                     if zoom_factor == 1:
                         continue
                     effect_index += 1
                     
-                    # 获取缩放中心点（从pos_json或使用默认中心）
-                    center_x = "iw/2"
-                    center_y = "ih/2"
+                    left_x = f"iw/(2*{zoom_factor})"
+                    top_y = f"ih/(2*{zoom_factor})"
                     pos_json_str = self.ext_data.get('posJson', '{}')
                     try:
                         pos_json = json.loads(pos_json_str) if pos_json_str != '{}' else {}
@@ -318,23 +313,14 @@ class FfmpegTask(object):
                                 center_x_ratio = (_f_x + _f_x2) / (2 * _v_w)
                                 center_y_ratio = (_f_y + _f_y2) / (2 * _v_h)
                                 # 转换为视频坐标系统
-                                center_x = f"iw*{center_x_ratio:.6f}"
-                                center_y = f"ih*{center_y_ratio:.6f}"
+                                left_x = f"iw*({center_x_ratio:.6f}-1/(2*{zoom_factor}))"
+                                top_y = f"ih*({center_y_ratio:.6f}-1/(2*{zoom_factor}))"
                     except Exception as e:
                         # 解析失败使用默认中心
                         pass
                     
-                    if duration == 0:
-                        # 静态缩放（整个视频时长）
-                        x_expr = f"({center_x})-(ow*zoom)/2"
-                        y_expr = f"({center_y})-(oh*zoom)/2"
-                        filter_args.append(f"{video_output_str}trim=start={start_time},zoompan=z={zoom_factor}:x={x_expr}:y={y_expr}:d=1[v_eff{effect_index}]")
-                    else:
-                        # 动态缩放（指定时间段内）
-                        zoom_expr = f"if(between(t\\,{start_time}\\,{start_time + duration})\\,{zoom_factor}\\,1)"
-                        x_expr = f"({center_x})-(ow*zoom)/2"
-                        y_expr = f"({center_y})-(oh*zoom)/2"
-                        filter_args.append(f"{video_output_str}zoompan=z={zoom_expr}:x={x_expr}:y={y_expr}:d=1[v_eff{effect_index}]")
+                    # 静态缩放（整个视频时长）
+                    filter_args.append(f"{video_output_str}scale={zoom_factor}*iw:{zoom_factor}*ih,crop=iw/{zoom_factor}:ih/{zoom_factor}:{left_x}:{top_y}[v_eff{effect_index}]")
                     video_output_str = f"[v_eff{effect_index}]"
                 elif effect.startswith("skip:"):
                     param = effect.split(":", 2)[1]
@@ -358,6 +344,15 @@ class FfmpegTask(object):
                         filter_args.append(f"[v_rev{effect_index}]trim=duration={tail_seconds}[v_trim{effect_index}]")
                         filter_args.append(f"[v_trim{effect_index}]reverse[v_eff{effect_index}]")
                         video_output_str = f"[v_eff{effect_index}]"
+                elif effect.startswith("show:"):
+                    param = effect.split(":", 2)[1]
+                    if param == '':
+                        param = "0"
+                    show_seconds = float(param)
+                    if show_seconds > 0:
+                        effect_index += 1
+                        filter_args.append(f"{video_output_str}trim=end={show_seconds}[v_eff{effect_index}]")
+                        video_output_str = f"[v_eff{effect_index}]"
                 ...
             if self.resolution:
                 filter_args.append(f"{video_output_str}scale={self.resolution.replace('x', ':')}[v]")