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

client: fix reading with multicast

Browse Source
This commit is contained in:
aler9
2021-06-19 21:13:08 +02:00
parent 47637e3ea2
commit aeaa200638
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
clientconn.go
View File

@@ -448,7 +448,7 @@ func (cc *ClientConn) runBackground() {
return cc.runBackgroundPlayTCP() return cc.runBackgroundPlayTCP()
} }
if *cc.protocol == ClientProtocolUDP || *cc.protocol == ClientProtocolMulticast { if *cc.protocol == ClientProtocolUDP {
return cc.runBackgroundRecordUDP() return cc.runBackgroundRecordUDP()
} }
return cc.runBackgroundRecordTCP() return cc.runBackgroundRecordTCP()
@@ -1636,20 +1636,22 @@ func (cc *ClientConn) WriteFrame(trackID int, streamType StreamType, payload []b
cc.tracks[trackID].rtcpSender.ProcessFrame(now, streamType, payload) cc.tracks[trackID].rtcpSender.ProcessFrame(now, streamType, payload)
} }
if *cc.protocol == ClientProtocolUDP { switch *cc.protocol {
case ClientProtocolUDP, ClientProtocolMulticast:
if streamType == StreamTypeRTP { if streamType == StreamTypeRTP {
return cc.tracks[trackID].udpRTPListener.write(payload) return cc.tracks[trackID].udpRTPListener.write(payload)
} }
return cc.tracks[trackID].udpRTCPListener.write(payload) return cc.tracks[trackID].udpRTCPListener.write(payload)
default: // TCP
cc.tcpWriteMutex.Lock()
defer cc.tcpWriteMutex.Unlock()
cc.nconn.SetWriteDeadline(now.Add(cc.c.WriteTimeout))
return base.InterleavedFrame{
TrackID: trackID,
StreamType: streamType,
Payload: payload,
}.Write(cc.bw)
} }
cc.tcpWriteMutex.Lock()
defer cc.tcpWriteMutex.Unlock()
cc.nconn.SetWriteDeadline(now.Add(cc.c.WriteTimeout))
return base.InterleavedFrame{
TrackID: trackID,
StreamType: streamType,
Payload: payload,
}.Write(cc.bw)
} }