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

server: remove useless code

Browse Source
This commit is contained in:
aler9
2022-03-13 15:02:01 +01:00
parent d54f478e16
commit 47caa2ed2c
1 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
serversession.go
View File

@@ -176,7 +176,6 @@ type ServerSession struct {
announcedTracks []ServerSessionAnnouncedTrack // publish announcedTracks []ServerSessionAnnouncedTrack // publish
udpLastFrameTime *int64 // publish udpLastFrameTime *int64 // publish
udpCheckStreamTimer *time.Timer udpCheckStreamTimer *time.Timer
udpReceiverReportTimer *time.Timer
writerRunning bool writerRunning bool
writeBuffer *ringbuffer.RingBuffer writeBuffer *ringbuffer.RingBuffer
@@ -205,7 +204,6 @@ func newServerSession(
conns: make(map[*ServerConn]struct{}), conns: make(map[*ServerConn]struct{}),
lastRequestTime: time.Now(), lastRequestTime: time.Now(),
udpCheckStreamTimer: emptyTimer(), udpCheckStreamTimer: emptyTimer(),
udpReceiverReportTimer: emptyTimer(),
request: make(chan sessionRequestReq), request: make(chan sessionRequestReq),
connRemove: make(chan *ServerConn), connRemove: make(chan *ServerConn),
startWriter: make(chan struct{}), startWriter: make(chan struct{}),
@@ -1068,13 +1066,15 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.setuppedStream.readerSetInactive(ss) ss.setuppedStream.readerSetInactive(ss)
ss.state = ServerSessionStatePrePlay ss.state = ServerSessionStatePrePlay
ss.udpCheckStreamTimer = emptyTimer()
switch *ss.setuppedTransport { switch *ss.setuppedTransport {
case TransportUDP: case TransportUDP:
ss.udpCheckStreamTimer = emptyTimer()
ss.s.udpRTCPListener.removeClient(ss) ss.s.udpRTCPListener.removeClient(ss)
case TransportUDPMulticast: case TransportUDPMulticast:
ss.udpCheckStreamTimer = emptyTimer()
default: // TCP default: // TCP
ss.tcpConn.readFunc = ss.tcpConn.readFuncStandard ss.tcpConn.readFunc = ss.tcpConn.readFuncStandard
@@ -1085,11 +1085,11 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
case ServerSessionStateRecord: case ServerSessionStateRecord:
ss.state = ServerSessionStatePreRecord ss.state = ServerSessionStatePreRecord
ss.udpCheckStreamTimer = emptyTimer()
ss.udpReceiverReportTimer = emptyTimer()
switch *ss.setuppedTransport { switch *ss.setuppedTransport {
case TransportUDP: case TransportUDP:
ss.udpCheckStreamTimer = emptyTimer()
ss.s.udpRTPListener.removeClient(ss) ss.s.udpRTPListener.removeClient(ss)
ss.s.udpRTCPListener.removeClient(ss) ss.s.udpRTCPListener.removeClient(ss)
@@ -1098,8 +1098,6 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.announcedTracks[trackID].rtcpReceiver = nil ss.announcedTracks[trackID].rtcpReceiver = nil
} }
case TransportUDPMulticast:
default: // TCP default: // TCP
ss.tcpConn.readFunc = ss.tcpConn.readFuncStandard ss.tcpConn.readFunc = ss.tcpConn.readFuncStandard
err = errSwitchReadFunc err = errSwitchReadFunc