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

improve write performance by

Browse Source 
* buffering packets before sending them
* removing mutexes
This commit is contained in:
aler9
2021-12-08 17:46:56 +01:00
parent a1de5ffdf9
commit f3096ec102
20 changed files with 969 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
serversession.go
View File

@@ -1,6 +1,7 @@
package gortsplib
import (
"bytes"
"context"
"fmt"
"net"
@@ -183,8 +184,9 @@ type ServerSession struct {
writerDone chan struct{}
// in
request chan sessionRequestReq
connRemove chan *ServerConn
request chan sessionRequestReq
connRemove chan *ServerConn
startWriter chan struct{}
}
func newServerSession(
@@ -206,6 +208,7 @@ func newServerSession(
udpReceiverReportTimer: emptyTimer(),
request: make(chan sessionRequestReq),
connRemove: make(chan *ServerConn),
startWriter: make(chan struct{}),
}
s.wg.Add(1)
@@ -314,6 +317,15 @@ func (ss *ServerSession) run() {
}
}
case <-ss.startWriter:
if !ss.writerRunning && (ss.state == ServerSessionStatePublish ||
ss.state == ServerSessionStateRead) &&
*ss.setuppedTransport == TransportTCP {
ss.writerRunning = true
ss.writerDone = make(chan struct{})
go ss.runWriter()
}
case <-ss.udpCheckStreamTimer.C:
now := time.Now()
@@ -876,9 +888,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.tcpConn.tcpProcessFunc = sc.tcpProcessPlay
ss.writeBuffer = ringbuffer.New(uint64(ss.s.ReadBufferCount))
ss.writerRunning = true
ss.writerDone = make(chan struct{})
go ss.runWriter()
// run writer after sending the response
ss.tcpConn.tcpWriterRunning = false
}
// add RTP-Info
@@ -1010,9 +1021,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
// that are much smaller than RTP packets and are sent at a fixed interval.
// decrease RAM consumption by allocating less buffers.
ss.writeBuffer = ringbuffer.New(uint64(8))
ss.writerRunning = true
ss.writerDone = make(chan struct{})
go ss.runWriter()
// run writer after sending the response
ss.tcpConn.tcpWriterRunning = false
}
return res, err
@@ -1096,7 +1106,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.tcpConn.tcpSession = nil
ss.tcpConn.tcpFrameEnabled = false
ss.tcpConn.tcpReadBuffer = nil
ss.tcpConn.nconn.SetReadDeadline(time.Time{})
ss.tcpConn.conn.SetReadDeadline(time.Time{})
ss.tcpConn = nil
}
}
@@ -1158,23 +1168,23 @@ func (ss *ServerSession) runWriter() {
}
}
} else {
var buf bytes.Buffer
writeFunc = func(trackID int, isRTP bool, payload []byte) {
if isRTP {
f := ss.setuppedTracks[trackID].tcpRTPFrame
f.Payload = payload
f.Write(&buf)
ss.tcpConn.tcpWriteMutex.Lock()
ss.tcpConn.nconn.SetWriteDeadline(time.Now().Add(ss.s.WriteTimeout))
f.Write(ss.tcpConn.bw)
ss.tcpConn.tcpWriteMutex.Unlock()
ss.tcpConn.conn.SetWriteDeadline(time.Now().Add(ss.s.WriteTimeout))
ss.tcpConn.conn.Write(buf.Bytes())
} else {
f := ss.setuppedTracks[trackID].tcpRTCPFrame
f.Payload = payload
f.Write(&buf)
ss.tcpConn.tcpWriteMutex.Lock()
ss.tcpConn.nconn.SetWriteDeadline(time.Now().Add(ss.s.WriteTimeout))
f.Write(ss.tcpConn.bw)
ss.tcpConn.tcpWriteMutex.Unlock()
ss.tcpConn.conn.SetWriteDeadline(time.Now().Add(ss.s.WriteTimeout))
ss.tcpConn.conn.Write(buf.Bytes())
}
}
}