diff --git a/go.mod b/go.mod index 04c2985..46f5180 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/pion/rtp v1.7.13 github.com/yapingcat/gomedia v0.0.0-20230426092936-387031404274 go.uber.org/zap v1.23.0 - m7s.live/engine/v4 v4.13.0 + m7s.live/engine/v4 v4.13.3 ) require ( diff --git a/go.sum b/go.sum index 962863c..c78d3a6 100644 --- a/go.sum +++ b/go.sum @@ -281,5 +281,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -m7s.live/engine/v4 v4.13.0 h1:zvzCUfZ8Ma4iTmLq9n0UAo9VLCU/b3oB+nbatUOgKAI= -m7s.live/engine/v4 v4.13.0/go.mod h1:LoALBfV5rmsz5TJQr6cmLxM33mfUE5BKBq/sMtXOVlc= +m7s.live/engine/v4 v4.13.3 h1:bboacBXHrnnIVu/NrK2vuiiCBrqmB5ZPUW4HN6l+gMU= +m7s.live/engine/v4 v4.13.3/go.mod h1:LoALBfV5rmsz5TJQr6cmLxM33mfUE5BKBq/sMtXOVlc= diff --git a/main.go b/main.go index 5f4ea1c..cde17ca 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,6 @@ import ( "strconv" "strings" "sync" - "time" "github.com/gobwas/ws" "github.com/gobwas/ws/wsutil" @@ -95,7 +94,7 @@ func (c *PSConfig) ServeUDP(conn *net.UDPConn) { var lastSSRC uint32 var lastPubber *PSPublisher for { - conn.SetReadDeadline(time.Now().Add(time.Second * 10)) + // conn.SetReadDeadline(time.Now().Add(time.Second * 10)) n, _, err := conn.ReadFromUDP(bufUDP) if err != nil { return diff --git a/subscriber.go b/subscriber.go index c515420..e95fc5f 100644 --- a/subscriber.go +++ b/subscriber.go @@ -20,7 +20,7 @@ func (ps *PSSubscriber) OnEvent(event any) { enter := false go v.Play(ps.IO, func(data *common.DataFrame[*util.ListItem[util.Buffer]]) error { if !enter { - if bytes.Compare(data.Value.Value[:3], []byte{0, 0, 1}) == 0 { + if bytes.Compare(data.Data.Value[:3], []byte{0, 0, 1}) == 0 { enter = true } else { return nil @@ -28,7 +28,7 @@ func (ps *PSSubscriber) OnEvent(event any) { } // fmt.Printf("% 02X", data.Value.Value[:10]) // fmt.Println() - return wsutil.WriteServerBinary(ps, data.Value.Value) + return wsutil.WriteServerBinary(ps, data.Data.Value) }) default: ps.Subscriber.OnEvent(event) diff --git a/track.go b/track.go index 9fe216e..801dd4d 100644 --- a/track.go +++ b/track.go @@ -9,7 +9,7 @@ import ( ) type PSTrack struct { - track.Data[*util.ListItem[util.Buffer]] + track.RecycleData[*util.ListItem[util.Buffer]] PSM util.Buffer `json:"-" yaml:"-"` } @@ -22,9 +22,6 @@ func NewPSTrack(s common.IStream) *PSTrack { result := &PSTrack{} result.Init(1000) result.SetStuff("ps", s) - result.Reset = func(f *common.DataFrame[*util.ListItem[util.Buffer]]) { - f.Value.Recycle() - } s.AddTrack(result) return result }