From f851cb696140c9841f13126933c83849f53847a6 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Wed, 26 Mar 2025 12:47:09 +0100 Subject: [PATCH] add missing Start() call; fix wrong sprintf (#4369) --- internal/servers/rtsp/session.go | 2 +- internal/servers/srt/conn.go | 2 +- internal/staticsources/hls/source.go | 2 +- internal/staticsources/rtsp/source.go | 2 +- internal/staticsources/srt/source.go | 2 +- internal/staticsources/udp/source.go | 2 +- internal/stream/stream.go | 5 ++++- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/internal/servers/rtsp/session.go b/internal/servers/rtsp/session.go index 8fa00e14..b44a75c1 100644 --- a/internal/servers/rtsp/session.go +++ b/internal/servers/rtsp/session.go @@ -68,7 +68,7 @@ func (s *session) initialize() { s.decodeErrors = &counterdumper.CounterDumper{ OnReport: func(val uint64) { - s.Log(logger.Warn, "%s decode %s", + s.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { diff --git a/internal/servers/srt/conn.go b/internal/servers/srt/conn.go index ebab068a..19981939 100644 --- a/internal/servers/srt/conn.go +++ b/internal/servers/srt/conn.go @@ -210,7 +210,7 @@ func (c *conn) runPublishReader(sconn srt.Conn, path defs.Path) error { decodeErrors := &counterdumper.CounterDumper{ OnReport: func(val uint64) { - c.Log(logger.Warn, "%s decode %s", + c.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { diff --git a/internal/staticsources/hls/source.go b/internal/staticsources/hls/source.go index a6a44543..a75b772d 100644 --- a/internal/staticsources/hls/source.go +++ b/internal/staticsources/hls/source.go @@ -40,7 +40,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error { decodeErrors := &counterdumper.CounterDumper{ OnReport: func(val uint64) { - s.Log(logger.Warn, "%s decode %s", + s.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { diff --git a/internal/staticsources/rtsp/source.go b/internal/staticsources/rtsp/source.go index 121323de..ca1911c8 100644 --- a/internal/staticsources/rtsp/source.go +++ b/internal/staticsources/rtsp/source.go @@ -96,7 +96,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error { decodeErrors := &counterdumper.CounterDumper{ OnReport: func(val uint64) { - s.Log(logger.Warn, "%s decode %s", + s.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { diff --git a/internal/staticsources/srt/source.go b/internal/staticsources/srt/source.go index 7aef1d6a..f8aa4b97 100644 --- a/internal/staticsources/srt/source.go +++ b/internal/staticsources/srt/source.go @@ -78,7 +78,7 @@ func (s *Source) runReader(sconn srt.Conn) error { decodeErrors := &counterdumper.CounterDumper{ OnReport: func(val uint64) { - s.Log(logger.Warn, "%s decode %s", + s.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { diff --git a/internal/staticsources/udp/source.go b/internal/staticsources/udp/source.go index 9ab88440..4c36705c 100644 --- a/internal/staticsources/udp/source.go +++ b/internal/staticsources/udp/source.go @@ -115,7 +115,7 @@ func (s *Source) runReader(pc net.PacketConn) error { decodeErrors := &counterdumper.CounterDumper{ OnReport: func(val uint64) { - s.Log(logger.Warn, "%s decode %s", + s.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { diff --git a/internal/stream/stream.go b/internal/stream/stream.go index acf75971..3f945811 100644 --- a/internal/stream/stream.go +++ b/internal/stream/stream.go @@ -55,7 +55,7 @@ func (s *Stream) Initialize() error { s.decodeErrors = &counterdumper.CounterDumper{ OnReport: func(val uint64) { - s.Parent.Log(logger.Warn, "%s decode %s", + s.Parent.Log(logger.Warn, "%d decode %s", val, func() string { if val == 1 { @@ -65,6 +65,7 @@ func (s *Stream) Initialize() error { }()) }, } + s.decodeErrors.Start() for _, media := range s.Desc.Medias { s.streamMedias[media] = &streamMedia{ @@ -84,6 +85,8 @@ func (s *Stream) Initialize() error { // Close closes all resources of the stream. func (s *Stream) Close() { + s.decodeErrors.Stop() + if s.rtspStream != nil { s.rtspStream.Close() }