修复data track订阅问题

This commit is contained in:
dexter
2023-02-15 21:12:42 +08:00
parent 10a188a1ac
commit d1e504381e
3 changed files with 5 additions and 5 deletions

View File

@@ -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))

View File

@@ -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))

View File

@@ -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