From e98cb8b1087e4ebe8d66cd40d1b0dfcee47f3bed Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Sat, 4 Dec 2021 22:11:10 +0100
Subject: [PATCH] rename tcpFrameBuffer into tcpReadBuffer

---
 client.go     | 14 +++++++-------
 serverconn.go | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client.go b/client.go
index 92f2f354..b3893e4f 100644
--- a/client.go
+++ b/client.go
@@ -209,7 +209,7 @@ type Client struct {
 	tracks             map[int]clientTrack
 	tracksByChannel    map[int]int
 	lastRange          *headers.Range
-	tcpFrameBuffer     *multibuffer.MultiBuffer // tcp
+	tcpReadBuffer      *multibuffer.MultiBuffer // tcp
 	tcpWriteMutex      sync.Mutex               // tcp
 	writeMutex         sync.RWMutex             // write
 	writeFrameAllowed  bool                     // write
@@ -618,7 +618,7 @@ func (c *Client) reset() {
 	c.protocol = nil
 	c.tracks = nil
 	c.tracksByChannel = nil
-	c.tcpFrameBuffer = nil
+	c.tcpReadBuffer = nil
 }
 
 func (c *Client) checkState(allowed map[clientState]struct{}) error {
@@ -750,7 +750,7 @@ func (c *Client) runReader() error {
 		res := base.Response{}
 
 		for {
-			frame.Payload = c.tcpFrameBuffer.Next()
+			frame.Payload = c.tcpReadBuffer.Next()
 			what, err := base.ReadInterleavedFrameOrResponse(&frame, &res, c.br)
 			if err != nil {
 				return err
@@ -908,12 +908,12 @@ func (c *Client) do(req *base.Request, skipResponse bool) (*base.Response, error
 
 		c.nconn.SetReadDeadline(time.Now().Add(c.ReadTimeout))
 
-		if c.tcpFrameBuffer != nil {
+		if c.tcpReadBuffer != nil {
 			// read the response and ignore interleaved frames in between;
 			// interleaved frames are sent in two scenarios:
 			// * when the server is v4lrtspserver, before the PLAY response
 			// * when the stream is already playing
-			err = res.ReadIgnoreFrames(c.br, c.tcpFrameBuffer.Next())
+			err = res.ReadIgnoreFrames(c.br, c.tcpReadBuffer.Next())
 			if err != nil {
 				return err
 			}
@@ -1459,8 +1459,8 @@ func (c *Client) doSetup(
 		cct.udpRTCPListener = rtcpListener
 
 	case TransportTCP:
-		if c.tcpFrameBuffer == nil {
-			c.tcpFrameBuffer = multibuffer.New(uint64(c.ReadBufferCount), uint64(c.ReadBufferSize))
+		if c.tcpReadBuffer == nil {
+			c.tcpReadBuffer = multibuffer.New(uint64(c.ReadBufferCount), uint64(c.ReadBufferSize))
 		}
 
 		if c.tracksByChannel == nil {
diff --git a/serverconn.go b/serverconn.go
index 648b2daf..0d28b2b1 100644
--- a/serverconn.go
+++ b/serverconn.go
@@ -43,7 +43,7 @@ type ServerConn struct {
 	tcpSession                  *ServerSession           // tcp
 	tcpFrameIsRecording         bool                     // tcp
 	tcpFrameTimeout             bool                     // tcp
-	tcpFrameBuffer              *multibuffer.MultiBuffer // tcp
+	tcpReadBuffer               *multibuffer.MultiBuffer // tcp
 	tcpFrameWriteBuffer         *ringbuffer.RingBuffer   // tcp
 	tcpFrameBackgroundWriteDone chan struct{}            // tcp
 	tcpProcessFunc              func(int, bool, []byte)
@@ -134,7 +134,7 @@ func (sc *ServerConn) run() {
 						sc.nconn.SetReadDeadline(time.Now().Add(sc.s.ReadTimeout))
 					}
 
-					frame.Payload = sc.tcpFrameBuffer.Next()
+					frame.Payload = sc.tcpReadBuffer.Next()
 					what, err := base.ReadInterleavedFrameOrRequest(&frame, &req, sc.br)
 					if err != nil {
 						return err
@@ -529,14 +529,14 @@ func (sc *ServerConn) handleRequestOuter(req *base.Request) error {
 		if sc.tcpFrameEnabled {
 			if sc.tcpFrameIsRecording {
 				sc.tcpFrameTimeout = true
-				sc.tcpFrameBuffer = multibuffer.New(uint64(sc.s.ReadBufferCount), uint64(sc.s.ReadBufferSize))
+				sc.tcpReadBuffer = multibuffer.New(uint64(sc.s.ReadBufferCount), uint64(sc.s.ReadBufferSize))
 				sc.tcpProcessFunc = sc.tcpProcessRecord
 			} else {
-				// when playing, tcpFrameBuffer is only used to receive RTCP receiver reports,
+				// when playing, tcpReadBuffer is only used to receive RTCP receiver reports,
 				// that are much smaller than RTP packets and are sent at a fixed interval
 				// (about 2 frames every 10 secs).
 				// decrease RAM consumption by allocating less buffers.
-				sc.tcpFrameBuffer = multibuffer.New(8, uint64(sc.s.ReadBufferSize))
+				sc.tcpReadBuffer = multibuffer.New(8, uint64(sc.s.ReadBufferSize))
 				sc.tcpProcessFunc = sc.tcpProcessPlay
 			}
 
@@ -554,7 +554,7 @@ func (sc *ServerConn) handleRequestOuter(req *base.Request) error {
 			<-sc.tcpFrameBackgroundWriteDone
 			sc.tcpFrameWriteBuffer.Reset()
 
-			sc.tcpFrameBuffer = nil
+			sc.tcpReadBuffer = nil
 		}
 
 	case sc.tcpFrameEnabled: // write to background write