From adf41861569d7fa864fbad5512957eeac25e7252 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 13 Apr 2025 14:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E9=81=BF=E5=85=8D=E5=88=87=E5=87=BA=E8=BF=87?=
 =?UTF-8?q?=E5=B0=8F=E7=9A=84=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 util/ffmpeg.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/util/ffmpeg.go b/util/ffmpeg.go
index 08603b9..46f82fd 100644
--- a/util/ffmpeg.go
+++ b/util/ffmpeg.go
@@ -35,13 +35,11 @@ func RunFfmpegTask(ctx context.Context, task *dto.FfmpegTask) bool {
 		result = runFfmpegForMultipleFile1(subCtx, task)
 	}
 	// 先尝试方法1
-	if result {
-		span.SetStatus(codes.Ok, "FFMPEG简易方法成功")
-		return true
+	if !result {
+		log.Printf("FFMPEG简易方法失败，尝试复杂方法转码")
+		// 不行再尝试方法二
+		result = runFfmpegForMultipleFile2(subCtx, task)
 	}
-	log.Printf("FFMPEG简易方法失败，尝试复杂方法转码")
-	// 不行再尝试方法二
-	result = runFfmpegForMultipleFile2(subCtx, task)
 	duration, err := GetVideoDuration(subCtx, task.OutputFile)
 	if err != nil {
 		span.SetAttributes(attribute.String("error", err.Error()))
@@ -53,10 +51,10 @@ func RunFfmpegTask(ctx context.Context, task *dto.FfmpegTask) bool {
 		return false
 	}
 	if result {
-		span.SetStatus(codes.Ok, "FFMPEG复杂方法成功")
+		span.SetStatus(codes.Ok, "成功")
 		return true
 	}
-	span.SetStatus(codes.Error, "FFMPEG复杂方法失败")
+	span.SetStatus(codes.Error, "失败")
 	return result
 }