package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 07:06:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

server: do not use StreamType

Browse Source
This commit is contained in:
aler9
2021-10-31 23:27:28 +01:00
committed by Alessandro Ros
parent fdb0d70870
commit e2b52d0b84
3 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
serverconn.go
View File

@@ -146,34 +146,34 @@ func (sc *ServerConn) run() {
switch what.(type) {
case *base.InterleavedFrame:
channel := frame.Channel
streamType := StreamTypeRTP
isRTP := true
if (channel % 2) != 0 {
channel--
streamType = StreamTypeRTCP
isRTP = false
}
// forward frame only if it has been set up
if trackID, ok := sc.tcpSession.setuppedTracksByChannel[channel]; ok {
if sc.tcpFrameIsRecording {
if streamType == StreamTypeRTP {
if isRTP {
if sc.tcpFrameIsRecording {
sc.tcpSession.announcedTracks[trackID].rtcpReceiver.ProcessPacketRTP(
time.Now(), frame.Payload)
} else {
sc.tcpSession.announcedTracks[trackID].rtcpReceiver.ProcessPacketRTCP(
time.Now(), frame.Payload)
}
}
if streamType == StreamTypeRTP {
if h, ok := sc.s.Handler.(ServerHandlerOnPacketRTP); ok {
h.OnPacketRTP(&ServerHandlerOnPacketRTPCtx{
Session: sc.tcpSession,
TrackID: trackID,
Payload: frame.Payload,
})
if h, ok := sc.s.Handler.(ServerHandlerOnPacketRTP); ok {
h.OnPacketRTP(&ServerHandlerOnPacketRTPCtx{
Session: sc.tcpSession,
TrackID: trackID,
Payload: frame.Payload,
})
}
}
} else {
if h, ok := sc.s.Handler.(ServerHandlerOnPacketRTCP); ok {
if sc.tcpFrameIsRecording {
sc.tcpSession.announcedTracks[trackID].rtcpReceiver.ProcessPacketRTCP(
time.Now(), frame.Payload)
}
h.OnPacketRTCP(&ServerHandlerOnPacketRTCPCtx{
Session: sc.tcpSession,
TrackID: trackID,