diff --git a/plugin.go b/plugin.go index 5047023..723b39d 100644 --- a/plugin.go +++ b/plugin.go @@ -220,7 +220,7 @@ var ErrStreamNotExist = errors.New("stream not exist") // SubscribeExist 订阅已经存在的流 func (opt *Plugin) SubscribeExist(streamPath string, sub ISubscriber) error { - opt.Info("subscribe exit", zap.String("path", streamPath)) + opt.Info("subscribe exsit", zap.String("path", streamPath)) path, _, _ := strings.Cut(streamPath, "?") if !Streams.Has(path) { opt.Warn("stream not exist", zap.String("path", streamPath)) diff --git a/subscriber.go b/subscriber.go index 305ec5b..50d5285 100644 --- a/subscriber.go +++ b/subscriber.go @@ -169,6 +169,7 @@ func (s *Subscriber) PlayBlock(subType byte) { ctx := s.TrackPlayer.Context conf := s.Config hasVideo, hasAudio := s.Video != nil && conf.SubVideo, s.Audio != nil && conf.SubAudio + defer s.onStop() if !hasAudio && !hasVideo { s.Error("play neither video nor audio") return @@ -260,7 +261,7 @@ func (s *Subscriber) PlayBlock(subType byte) { sendFlvFrame(codec.FLV_TAG_TYPE_AUDIO, s.AudioReader.AbsTime, frame.AVCC.ToBuffers()...) } } - defer s.onStop() + var subMode = conf.SubMode //订阅模式 if s.Args.Has(conf.SubModeArgName) { subMode, _ = strconv.Atoi(s.Args.Get(conf.SubModeArgName)) diff --git a/wait-tracks.go b/wait-tracks.go index 167e9cb..61d235f 100644 --- a/wait-tracks.go +++ b/wait-tracks.go @@ -76,9 +76,8 @@ func (w *waitTracks) Accept(t Track) bool { suber.OnEvent(t) } case *track.Data: - if w.data.Accept(t.GetBase().Name) { - suber.OnEvent(t) - } + w.data.Accept(t.GetBase().Name) + suber.OnEvent(t) } if w.NeedWait() { return false