zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-10-05 15:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

api: return static sources in paths/list even if sourceOnDemand is true

Browse Source
This commit is contained in:
aler9
2022-08-04 20:28:10 +02:00
parent ac0a5e9fc7
commit 7067c02030
6 changed files with 315 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/core/rtmp_source.go
View File

@@ -21,8 +21,8 @@ import (
type rtmpSourceParent interface {
log(logger.Level, string, ...interface{})
onSourceStaticSetReady(req pathSourceStaticSetReadyReq) pathSourceStaticSetReadyRes
onSourceStaticSetNotReady(req pathSourceStaticSetNotReadyReq)
onSourceStaticImplSetReady(req pathSourceStaticSetReadyReq) pathSourceStaticSetReadyRes
onSourceStaticImplSetNotReady(req pathSourceStaticSetNotReadyReq)
}
type rtmpSource struct {
@@ -119,9 +119,7 @@ func (s *rtmpSource) run(ctx context.Context) error {
tracks = append(tracks, audioTrack)
}
res := s.parent.onSourceStaticSetReady(pathSourceStaticSetReadyReq{
tracks: tracks,
})
res := s.parent.onSourceStaticImplSetReady(pathSourceStaticSetReadyReq{tracks: tracks})
if res.err != nil {
return res.err
}
@@ -129,7 +127,7 @@ func (s *rtmpSource) run(ctx context.Context) error {
s.Log(logger.Info, "ready")
defer func() {
s.parent.onSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{})
s.parent.onSourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
}()
for {