apps/monibuca
1
0
Fork 0
mirror of https://github.com/langhuihui/monibuca.git synced 2025-12-24 13:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: description use sync.Map

Browse Source
This commit is contained in:
langhuihui
2024-10-08 20:32:12 +08:00
parent 9cb27f654e
commit f2f65478ad
29 changed files with 233 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugin/transcode/pkg/cmd.go
View File

@@ -14,11 +14,9 @@ type CommandTask struct {
}
func (ct *CommandTask) Start() (err error) {
ct.Description = task.Description{
"cmd": ct.Cmd.String(),
}
ct.SetDescription("cmd", ct.Cmd.String())
if ct.logFileName != "" {
ct.Description["log"] = ct.logFileName
ct.SetDescription("log", ct.logFileName)
ct.logFile, err = os.OpenFile(ct.logFileName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
ct.Error("Could not create transcode log", "err", err)
@@ -35,12 +33,13 @@ func (ct *CommandTask) Start() (err error) {
}
ct.Info("start exec", "cmd", ct.Cmd.String())
err = ct.Cmd.Start()
ct.Description["pid"] = ct.Cmd.Process.Pid
ct.SetDescription("pid", ct.Cmd.Process.Pid)
return
}
func (ct *CommandTask) Dispose() {
_ = ct.Cmd.Process.Kill()
err := ct.Cmd.Process.Kill()
ct.Info("kill", "err", err)
if ct.logFile != nil {
_ = ct.logFile.Close()
}

21
plugin/transcode/pkg/transform.go
View File

@@ -1,6 +1,7 @@
package transcode
import (
"bufio"
"fmt"
"m7s.live/m7s/v5"
"m7s.live/m7s/v5/pkg/config"
@@ -46,9 +47,8 @@ type (
func NewTransform() m7s.ITransformer {
ret := &Transformer{}
ret.Description = map[string]any{
task.OwnerTypeKey: "Transcode",
}
ret.SetDescription(task.OwnerTypeKey, "Transcode")
var bufferFull time.Time
ret.WriteFlvTag = func(flv net.Buffers) (err error) {
var buffer []byte
for _, b := range flv {
@@ -56,8 +56,12 @@ func NewTransform() m7s.ITransformer {
}
select {
case ret.rBuf <- buffer:
bufferFull = time.Now()
default:
ret.Warn("pipe input buffer full")
if time.Since(bufferFull) > time.Second*5 {
ret.Stop(bufio.ErrBufferFull)
}
}
return
}
@@ -68,7 +72,6 @@ type Transformer struct {
m7s.DefaultTransformer
TransRule
rBuf chan []byte
*util.BufReader
flv.Live
}
@@ -127,23 +130,19 @@ func (t *Transformer) Start() (err error) {
args = append(args, to.Target)
}
}
t.Description = task.Description{
"cmd": args,
"config": t.TransRule,
}
t.SetDescription("cmd", args)
t.SetDescription("config", t.TransRule)
t.rBuf = make(chan []byte, 100)
t.BufReader = util.NewBufReaderChan(t.rBuf)
t.Subscriber = t.TransformJob.Subscriber
//t.BufReader.Dump, err = os.OpenFile("dump.flv", os.O_CREATE|os.O_WRONLY, 0644)
var cmdTask CommandTask
cmdTask.logFileName = fmt.Sprintf("logs/transcode_%s_%s.log", strings.ReplaceAll(t.TransformJob.StreamPath, "/", "_"), time.Now().Format("20060102150405"))
cmdTask.Cmd = exec.CommandContext(t, "ffmpeg", args...)
cmdTask.Cmd.Stdin = t.BufReader
cmdTask.Cmd.Stdin = util.NewBufReaderChan(t.rBuf)
t.AddTask(&cmdTask)
return
}
func (t *Transformer) Dispose() {
close(t.rBuf)
t.BufReader.Recycle()
}