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

update gortsplib

Browse Source
This commit is contained in:
aler9
2021-11-12 22:29:56 +01:00
parent 469ae7dbb2
commit f7419586af
20 changed files with 314 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/core/rtmp_source.go
View File

@@ -163,12 +163,12 @@ func (s *rtmpSource) runInner() bool {
s.parent.OnSourceStaticSetNotReady(pathSourceStaticSetNotReadyReq{Source: s})
}()
rtcpSenders := rtcpsenderset.New(tracks, res.Stream.onFrame)
rtcpSenders := rtcpsenderset.New(tracks, res.Stream.onPacketRTCP)
defer rtcpSenders.Close()
onFrame := func(trackID int, payload []byte) {
rtcpSenders.OnFrame(trackID, gortsplib.StreamTypeRTP, payload)
res.Stream.onFrame(trackID, gortsplib.StreamTypeRTP, payload)
onPacketRTP := func(trackID int, payload []byte) {
rtcpSenders.OnPacketRTP(trackID, payload)
res.Stream.onPacketRTP(trackID, payload)
}
for {
@@ -181,7 +181,7 @@ func (s *rtmpSource) runInner() bool {
switch pkt.Type {
case av.H264:
if videoTrack == nil {
return fmt.Errorf("received an H264 frame, but track is not set up")
return fmt.Errorf("received an H264 packet, but track is not set up")
}
nalus, err := h264.DecodeAVCC(pkt.Data)
@@ -216,12 +216,12 @@ func (s *rtmpSource) runInner() bool {
}
for _, byts := range bytss {
onFrame(videoTrackID, byts)
onPacketRTP(videoTrackID, byts)
}
case av.AAC:
if audioTrack == nil {
return fmt.Errorf("received an AAC frame, but track is not set up")
return fmt.Errorf("received an AAC packet, but track is not set up")
}
pkts, err := aacEncoder.Encode([][]byte{pkt.Data}, pkt.Time+pkt.CTime)
@@ -239,7 +239,7 @@ func (s *rtmpSource) runInner() bool {
}
for _, byts := range bytss {
onFrame(audioTrackID, byts)
onPacketRTP(audioTrackID, byts)
}
}
}