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

70
serversession.go
View File

@@ -160,25 +160,24 @@ type ServerSession struct {
secretID string // must not be shared, allows to take ownership of the session secretID string // must not be shared, allows to take ownership of the session
author *ServerConn author *ServerConn
ctx context.Context ctx context.Context
ctxCancel func() ctxCancel func()
conns map[*ServerConn]struct{} conns map[*ServerConn]struct{}
state ServerSessionState state ServerSessionState
setuppedTracks map[int]*ServerSessionSetuppedTrack setuppedTracks map[int]*ServerSessionSetuppedTrack
tcpTracksByChannel map[int]int tcpTracksByChannel map[int]int
setuppedTransport *Transport setuppedTransport *Transport
setuppedBaseURL *base.URL // publish setuppedBaseURL *base.URL // publish
setuppedStream *ServerStream // read setuppedStream *ServerStream // read
setuppedPath *string setuppedPath *string
setuppedQuery *string setuppedQuery *string
lastRequestTime time.Time lastRequestTime time.Time
tcpConn *ServerConn tcpConn *ServerConn
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
// writer channels // writer channels
writerDone chan struct{} writerDone chan struct{}
@@ -197,18 +196,17 @@ func newServerSession(
ctx, ctxCancel := context.WithCancel(s.ctx) ctx, ctxCancel := context.WithCancel(s.ctx)
ss := &ServerSession{ ss := &ServerSession{
s: s, s: s,
secretID: secretID, secretID: secretID,
author: author, author: author,
ctx: ctx, ctx: ctx,
ctxCancel: ctxCancel, ctxCancel: ctxCancel,
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{}),
} }
s.wg.Add(1) s.wg.Add(1)
@@ -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