zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-12-24 11:51:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtsp: fix crash when setupping tracks between stream changes (#5253) (#5257)

Browse Source
This commit is contained in:
Alessandro Ros
2025-12-07 11:38:52 +01:00
committed by GitHub
parent fc8012d3c7
commit 834b079b78
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/servers/rtsp/session.go
View File

@@ -194,6 +194,13 @@ func (s *session) onAnnounce(c *conn, ctx *gortsplib.ServerHandlerOnAnnounceCtx)
}, nil
}
func (s *session) rtspStream() *gortsplib.ServerStream {
if !s.isTLS {
return s.stream.RTSPStream(s.rserver)
}
return s.stream.RTSPSStream(s.rserver)
}
// onSetup is called by rtspServer.
func (s *session) onSetup(c *conn, ctx *gortsplib.ServerHandlerOnSetupCtx,
) (*base.Response, *gortsplib.ServerStream, error) {
@@ -226,7 +233,7 @@ func (s *session) onSetup(c *conn, ctx *gortsplib.ServerHandlerOnSetupCtx,
}
switch s.rsession.State() {
case gortsplib.ServerSessionStateInitial, gortsplib.ServerSessionStatePrePlay: // play
case gortsplib.ServerSessionStateInitial: // play
path, stream, err := s.pathManager.AddReader(defs.PathAddReaderReq{
Author: s,
AccessRequest: defs.PathAccessRequest{
@@ -261,16 +268,14 @@ func (s *session) onSetup(c *conn, ctx *gortsplib.ServerHandlerOnSetupCtx,
s.path = path
s.stream = stream
var rstream *gortsplib.ServerStream
if !s.isTLS {
rstream = stream.RTSPStream(s.rserver)
} else {
rstream = stream.RTSPSStream(s.rserver)
}
return &base.Response{
StatusCode: base.StatusOK,
}, rstream, nil
}, s.rtspStream(), nil
case gortsplib.ServerSessionStatePrePlay: // play, subsequent calls
return &base.Response{
StatusCode: base.StatusOK,
}, s.rtspStream(), nil
default: // record
return &base.Response{