update gortsplib

This commit is contained in:
aler9 2021-10-30 13:55:05 +02:00
parent c9c9c88ac8
commit 0c4cfd0e53
3 changed files with 6 additions and 14 deletions

View file

@ -162,17 +162,9 @@ func (s *rtspServer) close() {
func (s *rtspServer) run() {
defer s.wg.Done()
s.wg.Add(1)
serverErr := make(chan error)
go func() {
defer s.wg.Done()
err := s.srv.Wait()
select {
case serverErr <- err:
case <-s.ctx.Done():
}
serverErr <- s.srv.Wait()
}()
outer:
@ -182,13 +174,13 @@ outer:
break outer
case <-s.ctx.Done():
s.srv.Close()
<-serverErr
break outer
}
s.ctxCancel()
s.srv.Close()
if s.metrics != nil {
if !s.isTLS {
s.metrics.onRTSPServerSet(nil)