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

hls: new option hlsAlwaysRemux to always remux streams into HLS, not only when requested

Browse Source
This commit is contained in:
aler9
2021-07-29 16:56:40 +02:00
parent 4a1ca7aa3e
commit 1146d5cf1b
14 changed files with 345 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/core/rtmp_source.go
View File

@@ -24,9 +24,9 @@ const (
type rtmpSourceParent interface {
Log(logger.Level, string, ...interface{})
OnsourceExternalSetReady(req sourceExtSetReadyReq)
OnsourceExternalSetNotReady(req sourceExtSetNotReadyReq)
OnFrame(int, gortsplib.StreamType, []byte)
OnSourceExternalSetReady(req sourceExtSetReadyReq)
OnSourceExternalSetNotReady(req sourceExtSetNotReadyReq)
OnSourceFrame(int, gortsplib.StreamType, []byte)
}
type rtmpSource struct {
@@ -169,7 +169,7 @@ func (s *rtmpSource) runInner() bool {
s.log(logger.Info, "ready")
cres := make(chan sourceExtSetReadyRes)
s.parent.OnsourceExternalSetReady(sourceExtSetReadyReq{
s.parent.OnSourceExternalSetReady(sourceExtSetReadyReq{
Tracks: tracks,
Res: cres,
})
@@ -177,18 +177,18 @@ func (s *rtmpSource) runInner() bool {
defer func() {
res := make(chan struct{})
s.parent.OnsourceExternalSetNotReady(sourceExtSetNotReadyReq{
s.parent.OnSourceExternalSetNotReady(sourceExtSetNotReadyReq{
Res: res,
})
<-res
}()
rtcpSenders := rtcpsenderset.New(tracks, s.parent.OnFrame)
rtcpSenders := rtcpsenderset.New(tracks, s.parent.OnSourceFrame)
defer rtcpSenders.Close()
onFrame := func(trackID int, payload []byte) {
rtcpSenders.OnFrame(trackID, gortsplib.StreamTypeRTP, payload)
s.parent.OnFrame(trackID, gortsplib.StreamTypeRTP, payload)
s.parent.OnSourceFrame(trackID, gortsplib.StreamTypeRTP, payload)
}
for {