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

save RAM by allocating interleaved frames only when needed

Browse Source
This commit is contained in:
aler9
2022-02-18 22:46:23 +01:00
parent 82b03f368f
commit fc2dcf1cfe
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client.go
View File

@@ -58,8 +58,6 @@ type clientTrack struct {
udpRTPListener *clientUDPListener
udpRTCPListener *clientUDPListener
tcpChannel int
tcpRTPFrame *base.InterleavedFrame
tcpRTCPFrame *base.InterleavedFrame
rtcpReceiver *rtcpreceiver.RTCPReceiver
rtcpSender *rtcpsender.RTCPSender
}
@@ -1543,14 +1541,6 @@ func (c *Client) doSetup(
c.tracksByChannel[thRes.InterleavedIDs[0]] = trackID
cct.tcpChannel = thRes.InterleavedIDs[0]
cct.tcpRTPFrame = &base.InterleavedFrame{
Channel: cct.tcpChannel,
}
cct.tcpRTCPFrame = &base.InterleavedFrame{
Channel: cct.tcpChannel + 1,
}
}
if c.tracks == nil {
@@ -1834,18 +1824,26 @@ func (c *Client) runWriter() {
}
default: // TCP
rtpFrames := make(map[int]*base.InterleavedFrame, len(c.tracks))
rtcpFrames := make(map[int]*base.InterleavedFrame, len(c.tracks))
for trackID, cct := range c.tracks {
rtpFrames[trackID] = &base.InterleavedFrame{Channel: cct.tcpChannel}
rtcpFrames[trackID] = &base.InterleavedFrame{Channel: cct.tcpChannel + 1}
}
var buf bytes.Buffer
writeFunc = func(trackID int, isRTP bool, payload []byte) {
if isRTP {
f := c.tracks[trackID].tcpRTPFrame
f := rtpFrames[trackID]
f.Payload = payload
f.Write(&buf)
c.conn.SetWriteDeadline(time.Now().Add(c.WriteTimeout))
c.conn.Write(buf.Bytes())
} else {
f := c.tracks[trackID].tcpRTCPFrame
f := rtcpFrames[trackID]
f.Payload = payload
f.Write(&buf)