Skip to content

Commit 262ce82

Browse files
authored
refactor: use the built-in max/min to simplify the code (#4867)
Signed-off-by: alex9long <[email protected]>
1 parent 86bf9bd commit 262ce82

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

internal/protocols/rtmp/chunk/chunk0.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ func (c *Chunk0) Read(r io.Reader, maxBodyLen uint32, _ bool) error {
4040
c.Timestamp = uint32(header[0])<<24 | uint32(header[1])<<16 | uint32(header[2])<<8 | uint32(header[3])
4141
}
4242

43-
chunkBodyLen := c.BodyLen
44-
if chunkBodyLen > maxBodyLen {
45-
chunkBodyLen = maxBodyLen
46-
}
43+
chunkBodyLen := min(c.BodyLen, maxBodyLen)
4744

4845
c.Body = make([]byte, chunkBodyLen)
4946
_, err = io.ReadFull(r, c.Body)

internal/protocols/rtmp/chunk/chunk1.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ func (c *Chunk1) Read(r io.Reader, maxBodyLen uint32, _ bool) error {
4040
c.TimestampDelta = uint32(header[0])<<24 | uint32(header[1])<<16 | uint32(header[2])<<8 | uint32(header[3])
4141
}
4242

43-
chunkBodyLen := (c.BodyLen)
44-
if chunkBodyLen > maxBodyLen {
45-
chunkBodyLen = maxBodyLen
46-
}
43+
chunkBodyLen := min((c.BodyLen), maxBodyLen)
4744

4845
c.Body = make([]byte, chunkBodyLen)
4946
_, err = io.ReadFull(r, c.Body)

internal/protocols/rtmp/rawmessage/reader.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,7 @@ func (rc *readerChunkStream) readMessage(typ byte) (*Message, error) {
148148
return nil, fmt.Errorf("received type 2 chunk but expected type 3 chunk")
149149
}
150150

151-
chunkBodyLen := rc.curBodyLen
152-
if chunkBodyLen > rc.mr.chunkSize {
153-
chunkBodyLen = rc.mr.chunkSize
154-
}
151+
chunkBodyLen := min(rc.curBodyLen, rc.mr.chunkSize)
155152

156153
err := rc.readChunk(&rc.mr.c2, chunkBodyLen, false)
157154
if err != nil {
@@ -178,10 +175,7 @@ func (rc *readerChunkStream) readMessage(typ byte) (*Message, error) {
178175

179176
default: // 3
180177
if rc.curBodyRecv != 0 {
181-
chunkBodyLen := rc.curBodyLen - rc.curBodyRecv
182-
if chunkBodyLen > rc.mr.chunkSize {
183-
chunkBodyLen = rc.mr.chunkSize
184-
}
178+
chunkBodyLen := min(rc.curBodyLen-rc.curBodyRecv, rc.mr.chunkSize)
185179

186180
err := rc.readChunk(&rc.mr.c3, chunkBodyLen, rc.hasExtendedTimestamp)
187181
if err != nil {
@@ -208,10 +202,7 @@ func (rc *readerChunkStream) readMessage(typ byte) (*Message, error) {
208202
return nil, fmt.Errorf("received type 3 chunk without previous chunk")
209203
}
210204

211-
chunkBodyLen := rc.curBodyLen
212-
if chunkBodyLen > rc.mr.chunkSize {
213-
chunkBodyLen = rc.mr.chunkSize
214-
}
205+
chunkBodyLen := min(rc.curBodyLen, rc.mr.chunkSize)
215206

216207
err := rc.readChunk(&rc.mr.c3, chunkBodyLen, rc.hasExtendedTimestamp)
217208
if err != nil {

internal/protocols/rtmp/rawmessage/writer.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,7 @@ func (wc *writerChunkStream) writeMessage(msg *Message) error {
6363
}
6464

6565
for {
66-
chunkBodyLen := bodyLen - pos
67-
if chunkBodyLen > wc.mw.chunkSize {
68-
chunkBodyLen = wc.mw.chunkSize
69-
}
66+
chunkBodyLen := min(bodyLen-pos, wc.mw.chunkSize)
7067

7168
if firstChunk {
7269
firstChunk = false

0 commit comments

Comments
 (0)