CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

do not allow closed static sources to set a path as ready

Browse source
This commit is contained in:
aler9 2021-08-18 15:41:03 +02:00
parent 279459a472
commit a2ff0d455f
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/core/path.go
View file

@ -92,6 +92,7 @@ type pathSourceStaticSetReadyRes struct {
} }
type pathSourceStaticSetReadyReq struct { type pathSourceStaticSetReadyReq struct {
Source sourceStatic
Tracks gortsplib.Tracks Tracks gortsplib.Tracks
Res chan pathSourceStaticSetReadyRes Res chan pathSourceStaticSetReadyRes
} }
@ -348,8 +349,12 @@ outer:
} }
case req := <-pa.sourceStaticSetReady: case req := <-pa.sourceStaticSetReady:
if req.Source == pa.source {
pa.sourceSetReady(req.Tracks) pa.sourceSetReady(req.Tracks)
req.Res <- pathSourceStaticSetReadyRes{Stream: pa.stream} req.Res <- pathSourceStaticSetReadyRes{Stream: pa.stream}
} else {
req.Res <- pathSourceStaticSetReadyRes{Err: fmt.Errorf("terminated")}
}
case req := <-pa.sourceStaticSetNotReady: case req := <-pa.sourceStaticSetNotReady:
if req.Source == pa.source { if req.Source == pa.source {

1
internal/core/rtmp_source.go
View file

@ -159,6 +159,7 @@ func (s *rtmpSource) runInner() bool {
s.log(logger.Info, "ready") s.log(logger.Info, "ready")
res := s.parent.OnSourceStaticSetReady(pathSourceStaticSetReadyReq{ res := s.parent.OnSourceStaticSetReady(pathSourceStaticSetReadyReq{
Source: s,
Tracks: tracks, Tracks: tracks,
}) })
if res.Err != nil { if res.Err != nil {

1
internal/core/rtsp_source.go
View file

@ -178,6 +178,7 @@ func (s *rtspSource) runInner() bool {
s.log(logger.Info, "ready") s.log(logger.Info, "ready")
res := s.parent.OnSourceStaticSetReady(pathSourceStaticSetReadyReq{ res := s.parent.OnSourceStaticSetReady(pathSourceStaticSetReadyReq{
Source: s,
Tracks: conn.Tracks(), Tracks: conn.Tracks(),
}) })
if res.Err != nil { if res.Err != nil {