From 3e2627c55e8ab9fe8b8c740c75ffb8d2a311a90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Fri, 10 Apr 2026 15:22:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=86=99=E5=85=A5=E9=94=99=E8=AF=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VideoAnalysis/Learn.VideoAnalysis.csproj | 1 - VideoAnalysisCore/AICore/FFMPGE/FFMPGEHandle.cs | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/VideoAnalysis/Learn.VideoAnalysis.csproj b/VideoAnalysis/Learn.VideoAnalysis.csproj index 751985d..37cdb45 100644 --- a/VideoAnalysis/Learn.VideoAnalysis.csproj +++ b/VideoAnalysis/Learn.VideoAnalysis.csproj @@ -41,7 +41,6 @@ - diff --git a/VideoAnalysisCore/AICore/FFMPGE/FFMPGEHandle.cs b/VideoAnalysisCore/AICore/FFMPGE/FFMPGEHandle.cs index 6229ce2..7667e98 100644 --- a/VideoAnalysisCore/AICore/FFMPGE/FFMPGEHandle.cs +++ b/VideoAnalysisCore/AICore/FFMPGE/FFMPGEHandle.cs @@ -43,10 +43,13 @@ namespace VideoAnalysisCore.AICore.FFMPGE : Path.Combine(AppCommon.AIModelFile, "ffmpeg.exe"); private Repository videoTaskDB { get; set; } private VideoSliceWorkflowManager _workflowManager { get; set; } - public FFMPGEHandle(VideoSliceWorkflowManager workflowManager, Repository videoTaskDB) + private TidySlideWorkflowManager _tidySlideWorkflowManager { get; set; } + + public FFMPGEHandle(VideoSliceWorkflowManager workflowManager, Repository videoTaskDB, TidySlideWorkflowManager tidySlideWorkflowManager) { _workflowManager = workflowManager; this.videoTaskDB = videoTaskDB; + _tidySlideWorkflowManager = tidySlideWorkflowManager; } /// @@ -237,7 +240,7 @@ namespace VideoAnalysisCore.AICore.FFMPGE // -shortest 以最短的流为准 var mergeArgs = $"-i \"{pptPath}\" -i \"{taskPath}\" -map 0:v -map 1:a -c:v copy -c:a aac -strict experimental -shortest \"{mergedPath}\" -y"; - await _workflowManager.AddTaskLog(task, "开始合并视频与音频..."); + await _tidySlideWorkflowManager.AddTaskLog(task, "开始合并视频与音频..."); await ffmpeg.ExecuteAsync(mergeArgs, cToken); if (!File.Exists(mergedPath)) throw new Exception("视频合并失败"); @@ -250,13 +253,13 @@ namespace VideoAnalysisCore.AICore.FFMPGE // -hls_segment_filename out%03d.ts 切片文件名 var sliceArgs = $"-i \"{mergedPath}\" -c copy -f hls -hls_time 10 -hls_list_size 0 -hls_segment_filename \"{Path.Combine(localPath, "out%03d.ts")}\" \"{m3u8Path}\" -y"; - await _workflowManager.AddTaskLog(task, "开始视频切片..."); + await _tidySlideWorkflowManager.AddTaskLog(task, "开始视频切片..."); await ffmpeg.ExecuteAsync(sliceArgs, cToken); if (!File.Exists(m3u8Path)) throw new Exception("视频切片失败"); // 更新任务状态或路径? 目前只需要生成文件 - await _workflowManager.AddTaskLog(task, "视频处理完成"); + await _tidySlideWorkflowManager.AddTaskLog(task, "视频处理完成"); } } }