server: slightly improve write performance

serversession.go

@@ -138,9 +138,13 @@ func (s ServerSessionState) String() string {
 
 // ServerSessionSetuppedTrack is a setupped track of a ServerSession.
 type ServerSessionSetuppedTrack struct {
-	tcpChannel  int
+	tcpChannel   int
-	udpRTPPort  int
+	udpRTPPort   int
-	udpRTCPPort int
+	udpRTCPPort  int
+	udpRTPAddr   *net.UDPAddr
+	udpRTCPAddr  *net.UDPAddr
+	tcpRTPFrame  *base.InterleavedFrame
+	tcpRTCPFrame *base.InterleavedFrame
 }
 
 // ServerSessionAnnouncedTrack is an announced track of a ServerSession.
@@ -715,6 +719,18 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
 			sst.udpRTPPort = inTH.ClientPorts[0]
 			sst.udpRTCPPort = inTH.ClientPorts[1]
 
+			sst.udpRTPAddr = &net.UDPAddr{
+				IP:   ss.author.ip(),
+				Zone: ss.author.zone(),
+				Port: sst.udpRTPPort,
+			}
+
+			sst.udpRTCPAddr = &net.UDPAddr{
+				IP:   ss.author.ip(),
+				Zone: ss.author.zone(),
+				Port: sst.udpRTCPPort,
+			}
+
 			th.Protocol = headers.TransportProtocolUDP
 			de := headers.TransportDeliveryUnicast
 			th.Delivery = &de
@@ -734,6 +750,14 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
 		default: // TCP
 			sst.tcpChannel = inTH.InterleavedIDs[0]
 
+			sst.tcpRTPFrame = &base.InterleavedFrame{
+				Channel: sst.tcpChannel,
+			}
+
+			sst.tcpRTCPFrame = &base.InterleavedFrame{
+				Channel: sst.tcpChannel + 1,
+			}
+
 			if ss.tcpTracksByChannel == nil {
 				ss.tcpTracksByChannel = make(map[int]int)
 			}
@@ -1125,36 +1149,28 @@ func (ss *ServerSession) runWriter() {
 	if *ss.setuppedTransport == TransportUDP {
 		writeFunc = func(trackID int, isRTP bool, payload []byte) {
 			if isRTP {
-				ss.s.udpRTPListener.write(payload, &net.UDPAddr{
+				ss.s.udpRTPListener.write(payload, ss.setuppedTracks[trackID].udpRTPAddr)
-					IP:   ss.author.ip(),
-					Zone: ss.author.zone(),
-					Port: ss.setuppedTracks[trackID].udpRTPPort,
-				})
 			} else {
-				ss.s.udpRTCPListener.write(payload, &net.UDPAddr{
+				ss.s.udpRTCPListener.write(payload, ss.setuppedTracks[trackID].udpRTCPAddr)
-					IP:   ss.author.ip(),
-					Zone: ss.author.zone(),
-					Port: ss.setuppedTracks[trackID].udpRTCPPort,
-				})
 			}
 		}
 	} else {
 		writeFunc = func(trackID int, isRTP bool, payload []byte) {
 			if isRTP {
+				f := ss.setuppedTracks[trackID].tcpRTPFrame
+				f.Payload = payload
+
 				ss.tcpConn.tcpWriteMutex.Lock()
 				ss.tcpConn.nconn.SetWriteDeadline(time.Now().Add(ss.s.WriteTimeout))
-				(&base.InterleavedFrame{
+				f.Write(ss.tcpConn.bw)
-					Channel: ss.setuppedTracks[trackID].tcpChannel,
-					Payload: payload,
-				}).Write(ss.tcpConn.bw)
 				ss.tcpConn.tcpWriteMutex.Unlock()
 			} else {
+				f := ss.setuppedTracks[trackID].tcpRTCPFrame
+				f.Payload = payload
+
 				ss.tcpConn.tcpWriteMutex.Lock()
 				ss.tcpConn.nconn.SetWriteDeadline(time.Now().Add(ss.s.WriteTimeout))
-				(&base.InterleavedFrame{
+				f.Write(ss.tcpConn.bw)
-					Channel: ss.setuppedTracks[trackID].tcpChannel + 1,
-					Payload: payload,
-				}).Write(ss.tcpConn.bw)
 				ss.tcpConn.tcpWriteMutex.Unlock()
 			}
 		}

serverstream.go

@@ -57,6 +57,16 @@ func (h *multicastHandler) ip() net.IP {
 func (h *multicastHandler) runWriter() {
 	defer close(h.writerDone)
 
+	rtpAddr := &net.UDPAddr{
+		IP:   h.rtpl.ip(),
+		Port: h.rtpl.port(),
+	}
+
+	rtcpAddr := &net.UDPAddr{
+		IP:   h.rtcpl.ip(),
+		Port: h.rtcpl.port(),
+	}
+
 	for {
 		tmp, ok := h.writeBuffer.Pull()
 		if !ok {
@@ -65,15 +75,9 @@ func (h *multicastHandler) runWriter() {
 		data := tmp.(trackTypePayload)
 
 		if data.isRTP {
-			h.rtpl.write(data.payload, &net.UDPAddr{
+			h.rtpl.write(data.payload, rtpAddr)
-				IP:   h.rtpl.ip(),
-				Port: h.rtpl.port(),
-			})
 		} else {
-			h.rtcpl.write(data.payload, &net.UDPAddr{
+			h.rtcpl.write(data.payload, rtcpAddr)
-				IP:   h.rtcpl.ip(),
-				Port: h.rtcpl.port(),
-			})
 		}
 	}
 }