修复 HLS 导出细节

Signed-off-by: allan716 <[email protected]>

pkg/ffmpeg_helper/ffmpeg_helper.go

@@ -287,14 +287,14 @@ func (f *FFMPEGHelper) ExportVideoHLSAndSubByTimeRange(videoFullPath, subFullPat
 		return err
 	}
 
-	// 先剪切
-	videoExt := filepath.Ext(fileName)
-	cutOffVideoFPath := filepath.Join(outDirPath, frontName+"_cut"+videoExt)
-	args := f.getVideoExportArgsByTimeRange(videoFullPath, startTimeString, timeLength, cutOffVideoFPath)
-	execFFMPEG, err := f.execFFMPEG(args)
-	if err != nil {
-		return errors.New(execFFMPEG + err.Error())
-	}
+	//// 先剪切
+	//videoExt := filepath.Ext(fileName)
+	//cutOffVideoFPath := filepath.Join(outDirPath, frontName+"_cut"+videoExt)
+	//args := f.getVideoExportArgsByTimeRange(videoFullPath, startTimeString, timeLength, cutOffVideoFPath)
+	//execFFMPEG, err := f.execFFMPEG(args)
+	//if err != nil {
+	//	return errors.New(execFFMPEG + err.Error())
+	//}
 	//// 转换 HLS
 	//args = f.getVideo2HLSArgs(cutOffVideoFPath, segmentTime, outDirPath)
 	//execFFMPEG, err = f.execFFMPEG(args)
@@ -302,8 +302,9 @@ func (f *FFMPEGHelper) ExportVideoHLSAndSubByTimeRange(videoFullPath, subFullPat
 	//	return errors.New(execFFMPEG + err.Error())
 	//}
 
-	args = f.getVideoHLSExportArgsByTimeRange(videoFullPath, startTimeString, timeLength, segmentTime, outDirPath)
-	execFFMPEG, err = f.execFFMPEG(args)
+	// 直接导出
+	args := f.getVideoHLSExportArgsByTimeRange(videoFullPath, startTimeString, timeLength, segmentTime, outDirPath)
+	execFFMPEG, err := f.execFFMPEG(args)
 	if err != nil {
 		return errors.New(execFFMPEG + err.Error())
 	}