Merge pull request #205 from gaohan085/dev

decrease cpu usage while encode video
gaohan085 · Mar 26, 2024 · 9051c9b · 9051c9b
2 parents 064a4ed + cfb5749
commit 9051c9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/database/video-convert.go b/database/video-convert.go
@@ -166,7 +166,7 @@ func (v *VideoConvert) ReadLog(chInter <-chan int, chDone <-chan int) error { //
 func (v *VideoConvert) ConvertOnFFmpegServer(chInter chan<- int, chDone chan<- int) error {
 	v.OutputName = lib.GetFilenameWithoutExt(v.FileName) + "_cvt.mp4"
 	var script = fmt.Sprintf(`
-		ffmpeg -y -progress ffreport.log -i %s -movflags faststart -acodec copy -vcodec libx264 %s
+	taskset -c 0,1,2 ffmpeg -y -progress ffreport.log -i %s -movflags faststart -acodec copy -vcodec libx264 %s
 		`, v.PlaySource, v.OutputName)
 
 	cmd := exec.Command("bash")

diff --git a/handlers/v2/post-progress.go b/handlers/v2/post-progress.go
@@ -19,7 +19,7 @@ func PostProgress(ctx *fiber.Ctx) error {
 	}
 
 	if err := video.Update(); err != nil {
-		return err
+		return ctx.SendStatus(fiber.StatusInternalServerError)
 	}
 
 	if video.Status == "done" {