直接拼接逻辑

biz/ffmpeg.py

@@ -21,6 +21,7 @@ def parse_ffmpeg_task(task_info, template_info):
             logger.warning("no video found for part: " + str(part))
             continue
         sub_ffmpeg_task = FfmpegTask(source)
+        sub_ffmpeg_task.annexb = True
         sub_ffmpeg_task.frame_rate = template_info.get("frame_rate", 25)
         for lut in part.get('filters', []):
             sub_ffmpeg_task.add_lut(os.path.join(template_info.get("local_path"), lut))
@@ -75,9 +76,19 @@ def clear_task_tmp_file(ffmpeg_task):
     for task in ffmpeg_task.analyze_input_render_tasks():
         clear_task_tmp_file(task)
     try:
-        os.remove(ffmpeg_task.get_output_file())
-        logger.info("delete tmp file: " + ffmpeg_task.get_output_file())
+        if "template" not in ffmpeg_task.get_output_file():
+            os.remove(ffmpeg_task.get_output_file())
+            logger.info("delete tmp file: " + ffmpeg_task.get_output_file())
+        else:
+            logger.info("skip delete template file: " + ffmpeg_task.get_output_file())
     except OSError:
         logger.warning("delete tmp file failed: " + ffmpeg_task.get_output_file())
         return False
-    return True
+    return True
+
+
+def probe_video_info(ffmpeg_task):
+    # 获取视频长度宽度和时长
+    return ffmpeg.probe_video_info(ffmpeg_task.get_output_file())
+
+

biz/task.py

@@ -3,7 +3,7 @@ from util import api
 
 
 def start_task(task_info):
-    from biz.ffmpeg import parse_ffmpeg_task, start_ffmpeg_task, clear_task_tmp_file
+    from biz.ffmpeg import parse_ffmpeg_task, start_ffmpeg_task, clear_task_tmp_file, probe_video_info
     task_info = api.normalize_task(task_info)
     template_info = get_template_def(task_info.get("templateId"))
     api.report_task_start(task_info)
@@ -14,5 +14,11 @@ def start_task(task_info):
     oss_result = api.upload_task_file(task_info, ffmpeg_task)
     if not oss_result:
         return api.report_task_failed(task_info)
+    # 获取视频长度宽度和时长
+    width, height, duration = probe_video_info(ffmpeg_task)
     clear_task_tmp_file(ffmpeg_task)
-    api.report_task_success(task_info)
+    api.report_task_success(task_info, videoInfo={
+        "width": width,
+        "height": height,
+        "duration": duration
+    })