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

update gortsplib

Browse source
This commit is contained in:
aler9 2020-12-06 18:01:10 +01:00
parent 769e1a7e1a
commit 286d837d9e
7 changed files with 45 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
main.go
View file

@ -175,7 +175,8 @@ func (p *program) createDynamicResources(initial bool) error {
}
if p.serverTCP == nil {
p.serverTCP, err = servertcp.New(p.conf.RtspPort, p)
p.serverTCP, err = servertcp.New(p.conf.RtspPort, p.conf.ReadTimeout,
p.conf.WriteTimeout, p)
if err != nil {
return err
}
@ -189,7 +190,7 @@ func (p *program) createDynamicResources(initial bool) error {
if p.clientMan == nil {
p.clientMan = clientman.New(p.conf.RtspPort, p.conf.ReadTimeout,
p.conf.WriteTimeout, p.conf.RunOnConnect, p.conf.RunOnConnectRestart,
p.conf.RunOnConnect, p.conf.RunOnConnectRestart,
p.conf.ProtocolsParsed, p.stats, p.serverUDPRtp, p.serverUDPRtcp,
p.pathMan, p.serverTCP, p)
}
@ -274,7 +275,9 @@ func (p *program) reloadConf() error {
}
closeServerTCP := false
if conf.RtspPort != p.conf.RtspPort {
if conf.RtspPort != p.conf.RtspPort ||
conf.ReadTimeout != p.conf.ReadTimeout ||
conf.WriteTimeout != p.conf.WriteTimeout {
closeServerTCP = true
}
@ -295,7 +298,6 @@ func (p *program) reloadConf() error {
closePathMan ||
conf.RtspPort != p.conf.RtspPort ||
conf.ReadTimeout != p.conf.ReadTimeout ||
conf.WriteTimeout != p.conf.WriteTimeout ||
conf.RunOnConnect != p.conf.RunOnConnect ||
conf.RunOnConnectRestart != p.conf.RunOnConnectRestart ||
!reflect.DeepEqual(conf.ProtocolsParsed, p.conf.ProtocolsParsed) {