From 401e44f8e6580e6346f34001256640c963ca2b87 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Thu, 16 Jul 2020 11:43:36 +0200 Subject: [PATCH] unexport variable --- source-udpl.go | 2 +- source.go | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source-udpl.go b/source-udpl.go index f7effff6..9f90a4a2 100644 --- a/source-udpl.go +++ b/source-udpl.go @@ -80,7 +80,7 @@ func (l *sourceUdpListener) run() { continue } - l.source.RtcpReceivers[l.trackId].OnFrame(l.streamType, buf[:n]) + l.source.rtcpReceivers[l.trackId].OnFrame(l.streamType, buf[:n]) l.p.events <- programEventStreamerFrame{l.source, l.trackId, l.streamType, buf[:n]} } diff --git a/source.go b/source.go index 5f4626cd..38aa0740 100644 --- a/source.go +++ b/source.go @@ -32,7 +32,7 @@ type source struct { clientSdpParsed *sdp.SessionDescription serverSdpText []byte serverSdpParsed *sdp.SessionDescription - RtcpReceivers []*gortsplib.RtcpReceiver + rtcpReceivers []*gortsplib.RtcpReceiver readBuf *doubleBuffer terminate chan struct{} @@ -240,9 +240,9 @@ func (s *source) runUdp(conn *gortsplib.ConnClient) bool { return true } - s.RtcpReceivers = make([]*gortsplib.RtcpReceiver, len(s.clientSdpParsed.MediaDescriptions)) + s.rtcpReceivers = make([]*gortsplib.RtcpReceiver, len(s.clientSdpParsed.MediaDescriptions)) for trackId := range s.clientSdpParsed.MediaDescriptions { - s.RtcpReceivers[trackId] = gortsplib.NewRtcpReceiver() + s.rtcpReceivers[trackId] = gortsplib.NewRtcpReceiver() } for _, pair := range sourceUdpListenerPairs { @@ -275,7 +275,7 @@ outer: case <-checkStreamTicker.C: for trackId := range s.clientSdpParsed.MediaDescriptions { - if time.Since(s.RtcpReceivers[trackId].LastFrameTime()) >= s.p.conf.StreamDeadAfter { + if time.Since(s.rtcpReceivers[trackId].LastFrameTime()) >= s.p.conf.StreamDeadAfter { s.log("ERR: stream is dead") ret = true break outer @@ -284,7 +284,7 @@ outer: case <-receiverReportTicker.C: for trackId := range s.clientSdpParsed.MediaDescriptions { - frame := s.RtcpReceivers[trackId].Report() + frame := s.rtcpReceivers[trackId].Report() sourceUdpListenerPairs[trackId].rtcpl.writeChan <- &udpAddrBufPair{ addr: &net.UDPAddr{ IP: conn.NetConn().RemoteAddr().(*net.TCPAddr).IP, @@ -309,7 +309,7 @@ outer: } for trackId := range s.clientSdpParsed.MediaDescriptions { - s.RtcpReceivers[trackId].Close() + s.rtcpReceivers[trackId].Close() } return ret @@ -330,9 +330,9 @@ func (s *source) runTcp(conn *gortsplib.ConnClient) bool { return true } - s.RtcpReceivers = make([]*gortsplib.RtcpReceiver, len(s.clientSdpParsed.MediaDescriptions)) + s.rtcpReceivers = make([]*gortsplib.RtcpReceiver, len(s.clientSdpParsed.MediaDescriptions)) for trackId := range s.clientSdpParsed.MediaDescriptions { - s.RtcpReceivers[trackId] = gortsplib.NewRtcpReceiver() + s.rtcpReceivers[trackId] = gortsplib.NewRtcpReceiver() } s.p.events <- programEventStreamerReady{s} @@ -352,7 +352,7 @@ func (s *source) runTcp(conn *gortsplib.ConnClient) bool { break } - s.RtcpReceivers[frame.TrackId].OnFrame(frame.StreamType, frame.Content) + s.rtcpReceivers[frame.TrackId].OnFrame(frame.StreamType, frame.Content) s.p.events <- programEventStreamerFrame{s, frame.TrackId, frame.StreamType, frame.Content} } }() @@ -376,7 +376,7 @@ outer: case <-receiverReportTicker.C: for trackId := range s.clientSdpParsed.MediaDescriptions { - frame := s.RtcpReceivers[trackId].Report() + frame := s.rtcpReceivers[trackId].Report() conn.WriteFrame(&gortsplib.InterleavedFrame{ TrackId: trackId, @@ -392,7 +392,7 @@ outer: s.p.events <- programEventStreamerNotReady{s} for trackId := range s.clientSdpParsed.MediaDescriptions { - s.RtcpReceivers[trackId].Close() + s.rtcpReceivers[trackId].Close() } return ret