External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2025-12-20 02:00:05 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: use the built-in max/min to simplify the code (#4867)

Browse source 
Signed-off-by: alex9long <alex9long@outlook.com>
This commit is contained in:
alex9long 2025-08-14 16:32:24 +08:00 • committed by GitHub
parent 86bf9bdfd7
commit 262ce82d58
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/protocols/rtmp/chunk/chunk0.go
View file

@ -40,10 +40,7 @@ func (c *Chunk0) Read(r io.Reader, maxBodyLen uint32, _ bool) error {
c.Timestamp = uint32(header[0])<<24 | uint32(header[1])<<16 | uint32(header[2])<<8 | uint32(header[3]) c.Timestamp = uint32(header[0])<<24 | uint32(header[1])<<16 | uint32(header[2])<<8 | uint32(header[3])
} }
chunkBodyLen := c.BodyLen chunkBodyLen := min(c.BodyLen, maxBodyLen)
if chunkBodyLen > maxBodyLen {
chunkBodyLen = maxBodyLen
}
c.Body = make([]byte, chunkBodyLen) c.Body = make([]byte, chunkBodyLen)
_, err = io.ReadFull(r, c.Body) _, err = io.ReadFull(r, c.Body)

5
internal/protocols/rtmp/chunk/chunk1.go
View file

@ -40,10 +40,7 @@ func (c *Chunk1) Read(r io.Reader, maxBodyLen uint32, _ bool) error {
c.TimestampDelta = uint32(header[0])<<24 | uint32(header[1])<<16 | uint32(header[2])<<8 | uint32(header[3]) c.TimestampDelta = uint32(header[0])<<24 | uint32(header[1])<<16 | uint32(header[2])<<8 | uint32(header[3])
} }
chunkBodyLen := (c.BodyLen) chunkBodyLen := min((c.BodyLen), maxBodyLen)
if chunkBodyLen > maxBodyLen {
chunkBodyLen = maxBodyLen
}
c.Body = make([]byte, chunkBodyLen) c.Body = make([]byte, chunkBodyLen)
_, err = io.ReadFull(r, c.Body) _, err = io.ReadFull(r, c.Body)

15
internal/protocols/rtmp/rawmessage/reader.go
View file

@ -148,10 +148,7 @@ func (rc *readerChunkStream) readMessage(typ byte) (*Message, error) {
return nil, fmt.Errorf("received type 2 chunk but expected type 3 chunk") return nil, fmt.Errorf("received type 2 chunk but expected type 3 chunk")
} }
chunkBodyLen := rc.curBodyLen chunkBodyLen := min(rc.curBodyLen, rc.mr.chunkSize)
if chunkBodyLen > rc.mr.chunkSize {
chunkBodyLen = rc.mr.chunkSize
}
err := rc.readChunk(&rc.mr.c2, chunkBodyLen, false) err := rc.readChunk(&rc.mr.c2, chunkBodyLen, false)
if err != nil { if err != nil {
@ -178,10 +175,7 @@ func (rc *readerChunkStream) readMessage(typ byte) (*Message, error) {
default: // 3 default: // 3
if rc.curBodyRecv != 0 { if rc.curBodyRecv != 0 {
chunkBodyLen := rc.curBodyLen - rc.curBodyRecv chunkBodyLen := min(rc.curBodyLen-rc.curBodyRecv, rc.mr.chunkSize)
if chunkBodyLen > rc.mr.chunkSize {
chunkBodyLen = rc.mr.chunkSize
}
err := rc.readChunk(&rc.mr.c3, chunkBodyLen, rc.hasExtendedTimestamp) err := rc.readChunk(&rc.mr.c3, chunkBodyLen, rc.hasExtendedTimestamp)
if err != nil { if err != nil {
@ -208,10 +202,7 @@ func (rc *readerChunkStream) readMessage(typ byte) (*Message, error) {
return nil, fmt.Errorf("received type 3 chunk without previous chunk") return nil, fmt.Errorf("received type 3 chunk without previous chunk")
} }
chunkBodyLen := rc.curBodyLen chunkBodyLen := min(rc.curBodyLen, rc.mr.chunkSize)
if chunkBodyLen > rc.mr.chunkSize {
chunkBodyLen = rc.mr.chunkSize
}
err := rc.readChunk(&rc.mr.c3, chunkBodyLen, rc.hasExtendedTimestamp) err := rc.readChunk(&rc.mr.c3, chunkBodyLen, rc.hasExtendedTimestamp)
if err != nil { if err != nil {

5
internal/protocols/rtmp/rawmessage/writer.go
View file

@ -63,10 +63,7 @@ func (wc *writerChunkStream) writeMessage(msg *Message) error {
} }
for { for {
chunkBodyLen := bodyLen - pos chunkBodyLen := min(bodyLen-pos, wc.mw.chunkSize)
if chunkBodyLen > wc.mw.chunkSize {
chunkBodyLen = wc.mw.chunkSize
}
if firstChunk { if firstChunk {
firstChunk = false firstChunk = false