zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-10-05 07:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix crash that happens when sourceOnDemand is true and a source times out

Browse Source
This commit is contained in:
aler9
2021-08-10 18:34:10 +02:00
parent 3872b42434
commit 6163095a11
10 changed files with 185 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/core/rtmp_source.go
View File

@@ -24,9 +24,8 @@ const (
type rtmpSourceParent interface {
Log(logger.Level, string, ...interface{})
OnSourceStaticSetReady(req pathSourceStaticSetReadyReq)
OnSourceStaticSetReady(req pathSourceStaticSetReadyReq) pathSourceStaticSetReadyRes
OnSourceStaticSetNotReady(req pathSourceStaticSetNotReadyReq)
OnSourceFrame(int, gortsplib.StreamType, []byte)
}
type rtmpSource struct {
@@ -162,20 +161,23 @@ func (s *rtmpSource) runInner() bool {
s.log(logger.Info, "ready")
s.parent.OnSourceStaticSetReady(pathSourceStaticSetReadyReq{
res := s.parent.OnSourceStaticSetReady(pathSourceStaticSetReadyReq{
Tracks: tracks,
})
if res.Err != nil {
return err
}
defer func() {
s.parent.OnSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{Source: s})
}()
rtcpSenders := rtcpsenderset.New(tracks, s.parent.OnSourceFrame)
rtcpSenders := rtcpsenderset.New(tracks, res.Stream.onFrame)
defer rtcpSenders.Close()
onFrame := func(trackID int, payload []byte) {
rtcpSenders.OnFrame(trackID, gortsplib.StreamTypeRTP, payload)
s.parent.OnSourceFrame(trackID, gortsplib.StreamTypeRTP, payload)
res.Stream.onFrame(trackID, gortsplib.StreamTypeRTP, payload)
}
for {