rtsp, rtmp: fix ignored errors

This commit is contained in:
aler9 2021-08-19 17:28:42 +02:00
parent 4fdd42fa58
commit 801ef44f54
2 changed files with 11 additions and 16 deletions

View File

@ -78,22 +78,17 @@ func (s *rtmpSource) log(level logger.Level, format string, args ...interface{})
func (s *rtmpSource) run() {
defer s.wg.Done()
outer:
for {
ok := func() bool {
ok := s.runInner()
if !ok {
return false
}
select {
case <-time.After(rtmpSourceRetryPause):
return true
case <-s.ctx.Done():
return false
}
}()
ok := s.runInner()
if !ok {
break
break outer
}
select {
case <-time.After(rtmpSourceRetryPause):
case <-s.ctx.Done():
break outer
}
}
@ -158,7 +153,7 @@ func (s *rtmpSource) runInner() bool {
Tracks: tracks,
})
if res.Err != nil {
return err
return res.Err
}
s.log(logger.Info, "ready")

View File

@ -177,7 +177,7 @@ func (s *rtspSource) runInner() bool {
Tracks: conn.Tracks(),
})
if res.Err != nil {
s.log(logger.Info, "ERR: %s", err)
s.log(logger.Info, "ERR: %s", res.Err)
return true
}